From dfa977a0209ee84de78b26319f00cd40f3415159 Mon Sep 17 00:00:00 2001 From: MattBDev <4009945+MattBDev@users.noreply.github.com> Date: Fri, 10 Apr 2020 20:19:18 -0400 Subject: [PATCH] Moved more packaged based on feedback --- Bukkit/build.gradle | 18 +- .../bukkit/util/BukkitHybridUtils.java | 8 - .../bukkit/util/BukkitVersion.java | 5 - .../bukkit}/BukkitChunkManager.java | 36 +-- .../bukkit}/BukkitCommand.java | 15 +- .../plotsquared/bukkit/BukkitMain.java | 142 ++++++----- .../plotsquared/bukkit/chat/ArrayWrapper.java | 2 +- .../plotsquared/bukkit/chat/FancyMessage.java | 2 +- .../bukkit/chat/JsonRepresentedObject.java | 2 +- .../plotsquared/bukkit/chat/JsonString.java | 2 +- .../plotsquared/bukkit/chat/MessagePart.java | 2 +- .../plotsquared/bukkit/chat/Reflection.java | 2 +- .../bukkit/chat/TextualComponent.java | 2 +- .../bukkit/commands/DebugUUID.java | 46 ++-- .../bukkit}/entity/AgeableStats.java | 2 +- .../bukkit}/entity/ArmorStandStats.java | 2 +- .../bukkit}/entity/EntityBaseStats.java | 2 +- .../bukkit}/entity/EntityWrapper.java | 2 +- .../bukkit}/entity/HorseStats.java | 2 +- .../bukkit}/entity/LivingEntityStats.java | 2 +- .../entity/ReplicatingEntityWrapper.java | 4 +- .../bukkit}/entity/TameableStats.java | 2 +- .../bukkit}/entity/TeleportEntityWrapper.java | 4 +- .../generator/BukkitAugmentedGenerator.java | 4 +- .../bukkit/generator/BukkitHybridUtils.java | 8 + .../bukkit/generator/BukkitPlotGenerator.java | 24 +- .../generator/DelegatePlotGenerator.java | 18 +- .../bukkit/generator/PlotBlockPopulator.java | 16 +- .../bukkit/listeners/ChunkListener.java | 20 +- .../bukkit/listeners/EntitySpawnListener.java | 16 +- .../bukkit/listeners/ForceFieldListener.java | 18 +- .../bukkit/listeners/PlayerEvents.java | 108 ++++++--- .../bukkit/listeners/SingleWorldListener.java | 12 +- .../bukkit/listeners/WorldEvents.java | 12 +- .../placeholders/PlaceholderFormatter.java | 8 +- .../bukkit/placeholders/Placeholders.java | 10 +- .../bukkit/player}/BukkitOfflinePlayer.java | 4 +- .../bukkit/player}/BukkitPlayer.java | 24 +- .../schematic}/BukkitSchematicHandler.java | 17 +- .../bukkit/util/BukkitChatManager.java | 18 +- .../bukkit/util/BukkitEconHandler.java | 12 +- .../bukkit/util/BukkitInventoryUtil.java | 12 +- .../bukkit/util/BukkitSetupUtils.java | 22 +- .../bukkit/util/BukkitTaskManager.java | 6 +- .../plotsquared/bukkit/util/BukkitUtil.java | 32 +-- .../plotsquared/bukkit/util/Metrics.java | 2 +- .../bukkit/util/OfflinePlayerUtil.java | 20 +- .../plotsquared/bukkit/util/SendChunk.java | 26 +- .../plotsquared/bukkit/util/SetGenCB.java | 10 +- .../bukkit/util/UpdateUtility.java | 11 +- .../bukkit/util/block}/BukkitBlockUtil.java | 2 +- .../bukkit/util/block/BukkitLocalQueue.java | 12 +- .../bukkit/util/block/GenChunk.java | 15 +- .../bukkit/util/block}/StateWrapper.java | 8 +- .../bukkit/util}/uuid/DatFileFilter.java | 2 +- .../bukkit/util}/uuid/DefaultUUIDWrapper.java | 12 +- .../bukkit/util}/uuid/FileUUIDHandler.java | 26 +- .../util}/uuid/LowerOfflineUUIDWrapper.java | 6 +- .../bukkit/util}/uuid/OfflineUUIDWrapper.java | 16 +- .../bukkit/util}/uuid/SQLUUIDHandler.java | 24 +- Bukkit/src/main/resources/plugin.yml | 2 +- Core/build.gradle | 16 +- .../plotsquared/plot/PlotWeather.java | 5 - .../plot/flags/GlobalFlagContainer.java | 222 ------------------ .../plot/object/TeleportCause.java | 5 - .../plotsquared/util/logger/ILogger.java | 5 - .../plotsquared/IPlotMain.java | 32 +-- .../plotsquared/Platform.java | 2 +- .../plotsquared/PlotSquared.java | 107 +++++---- .../plotsquared/PlotVersion.java | 2 +- .../plotsquared/api/PlotAPI.java | 33 +-- .../AbstractDelegateOutputStream.java | 2 +- .../plotsquared/collection/ArrayUtil.java | 2 +- .../collection/FlatRandomCollection.java | 4 +- .../collection/RandomCollection.java | 2 +- .../collection/SimpleRandomCollection.java | 2 +- .../plotsquared/commands/Add.java | 20 +- .../plotsquared/commands/Alias.java | 22 +- .../plotsquared/commands/Area.java | 52 ++-- .../plotsquared/commands/Argument.java | 4 +- .../plotsquared/commands/Auto.java | 44 ++-- .../plotsquared/commands/Biome.java | 12 +- .../plotsquared/commands/Buy.java | 31 +-- .../plotsquared/commands/Chat.java | 4 +- .../plotsquared/commands/Claim.java | 37 +-- .../plotsquared/commands/Clear.java | 34 +-- .../plotsquared/commands/Cluster.java | 32 +-- .../plotsquared/commands/CmdConfirm.java | 11 +- .../plotsquared/commands/CmdInstance.java | 2 +- .../plotsquared/commands/Command.java | 26 +- .../plotsquared/commands/CommandCaller.java | 2 +- .../plotsquared/commands/CommandCategory.java | 4 +- .../commands/CommandDeclaration.java | 2 +- .../plotsquared/commands/Comment.java | 20 +- .../plotsquared/commands/Condense.java | 20 +- .../plotsquared/commands/Confirm.java | 12 +- .../plotsquared/commands/Continue.java | 24 +- .../plotsquared/commands/Copy.java | 14 +- .../commands/CreateRoadSchematic.java | 16 +- .../plotsquared/commands/DatabaseCommand.java | 29 +-- .../plotsquared/commands/Debug.java | 16 +- .../commands/DebugAllowUnsafe.java | 6 +- .../plotsquared/commands/DebugClaimTest.java | 28 +-- .../plotsquared/commands/DebugExec.java | 70 +++--- .../commands/DebugImportWorlds.java | 22 +- .../plotsquared/commands/DebugLoadTest.java | 8 +- .../plotsquared/commands/DebugPaste.java | 25 +- .../plotsquared/commands/DebugRoadRegen.java | 20 +- .../plotsquared/commands/DebugSaveTest.java | 12 +- .../plotsquared/commands/Delete.java | 28 +-- .../plotsquared/commands/Deny.java | 22 +- .../plotsquared/commands/Desc.java | 20 +- .../plotsquared/commands/Dislike.java | 4 +- .../plotsquared/commands/Done.java | 36 +-- .../plotsquared/commands/Download.java | 26 +- .../plotsquared/commands/FlagCommand.java | 52 ++-- .../plotsquared/commands/Grant.java | 22 +- .../plotsquared/commands/Help.java | 18 +- .../plotsquared/commands/Inbox.java | 20 +- .../plotsquared/commands/Info.java | 18 +- .../plotsquared/commands/Kick.java | 22 +- .../plotsquared/commands/Leave.java | 16 +- .../plotsquared/commands/Like.java | 28 +-- .../plotsquared/commands/ListCmd.java | 42 ++-- .../plotsquared/commands/Load.java | 28 +-- .../plotsquared/commands/MainCommand.java | 26 +- .../plotsquared/commands/Merge.java | 38 ++- .../plotsquared/commands/Middle.java | 12 +- .../plotsquared/commands/Move.java | 22 +- .../plotsquared/commands/Music.java | 21 +- .../plotsquared/commands/Near.java | 14 +- .../plotsquared/commands/Owner.java | 26 +- .../plotsquared/commands/PluginCmd.java | 15 +- .../plotsquared/commands/Purge.java | 24 +- .../plotsquared/commands/Rate.java | 34 +-- .../plotsquared/commands/RegenAllRoads.java | 18 +- .../plotsquared/commands/Relight.java | 18 +- .../plotsquared/commands/Reload.java | 18 +- .../plotsquared/commands/Remove.java | 20 +- .../plotsquared/commands/RequiredType.java | 2 +- .../plotsquared/commands/Save.java | 24 +- .../plotsquared/commands/SchematicCmd.java | 32 +-- .../plotsquared/commands/Set.java | 22 +- .../plotsquared/commands/SetCommand.java | 18 +- .../plotsquared/commands/SetHome.java | 14 +- .../plotsquared/commands/Setup.java | 36 +-- .../plotsquared/commands/SubCommand.java | 10 +- .../plotsquared/commands/Swap.java | 18 +- .../plotsquared/commands/Target.java | 16 +- .../plotsquared/commands/Template.java | 38 +-- .../plotsquared/commands/Toggle.java | 12 +- .../plotsquared/commands/Trim.java | 32 +-- .../plotsquared/commands/Trust.java | 20 +- .../plotsquared/commands/Unlink.java | 24 +- .../plotsquared/commands/Visit.java | 30 +-- .../plotsquared/commands/WE_Anywhere.java | 4 +- .../plot => plotsquared}/config/Caption.java | 8 +- .../config/CaptionUtility.java | 4 +- .../plot => plotsquared}/config/Captions.java | 10 +- .../config/ChatFormatter.java | 4 +- .../plot => plotsquared}/config/Config.java | 12 +- .../config/Configuration.java | 4 +- .../config/ConfigurationNode.java | 6 +- .../config/PlotSquaredChatFormatter.java | 4 +- .../plot => plotsquared}/config/Settings.java | 4 +- .../config/StaticCaption.java | 2 +- .../plot => plotsquared}/config/Storage.java | 2 +- .../configuration/Configuration.java | 2 +- .../configuration/ConfigurationOptions.java | 2 +- .../configuration/ConfigurationSection.java | 2 +- .../InvalidConfigurationException.java | 2 +- .../configuration/MemoryConfiguration.java | 2 +- .../MemoryConfigurationOptions.java | 2 +- .../configuration/MemorySection.java | 2 +- .../configuration/file/FileConfiguration.java | 8 +- .../file/FileConfigurationOptions.java | 8 +- .../configuration/file/YamlConfiguration.java | 10 +- .../file/YamlConfigurationOptions.java | 2 +- .../configuration/file/YamlConstructor.java | 4 +- .../configuration/file/YamlRepresenter.java | 8 +- .../ConfigurationSerializable.java | 2 +- .../ConfigurationSerialization.java | 4 +- .../DelegateDeserialization.java | 2 +- .../serialization/SerializableAs.java | 2 +- .../plotsquared/database/AbstractDB.java | 16 +- .../plotsquared/database/DBFunc.java | 16 +- .../plotsquared/database/Database.java | 2 +- .../plotsquared/database/MySQL.java | 6 +- .../plotsquared/database/SQLManager.java | 42 ++-- .../plotsquared/database/SQLite.java | 4 +- .../plotsquared/database/StmtMod.java | 4 +- .../events/CancellablePlotEvent.java | 2 +- .../events/PlayerAutoPlotEvent.java | 8 +- .../events/PlayerClaimPlotEvent.java | 8 +- .../events/PlayerEnterPlotEvent.java | 6 +- .../events/PlayerLeavePlotEvent.java | 6 +- .../events/PlayerPlotDeniedEvent.java | 6 +- .../events/PlayerPlotHelperEvent.java | 6 +- .../events/PlayerPlotTrustedEvent.java | 6 +- .../events/PlayerTeleportToPlotEvent.java | 8 +- .../events/PlotAutoMergeEvent.java | 6 +- .../events/PlotChangeOwnerEvent.java | 8 +- .../plotsquared/events/PlotClearEvent.java | 6 +- .../events/PlotComponentSetEvent.java | 6 +- .../plotsquared/events/PlotDeleteEvent.java | 6 +- .../plotsquared/events/PlotDoneEvent.java | 6 +- .../plotsquared/events/PlotEvent.java | 4 +- .../plotsquared/events/PlotFlagAddEvent.java | 6 +- .../plotsquared/events/PlotFlagEvent.java | 6 +- .../events/PlotFlagRemoveEvent.java | 6 +- .../plotsquared/events/PlotMergeEvent.java | 8 +- .../plotsquared/events/PlotPlayerEvent.java | 6 +- .../plotsquared/events/PlotRateEvent.java | 8 +- .../plotsquared/events/PlotUnlinkEvent.java | 6 +- .../plotsquared/events/Result.java | 2 +- .../com/plotsquared/events/TeleportCause.java | 5 + .../plotsquared/generator/AugmentedUtils.java | 24 +- .../generator/ClassicPlotManager.java | 24 +- .../generator/ClassicPlotWorld.java | 16 +- .../generator/GeneratorWrapper.java | 4 +- .../generator/GridPlotManager.java | 6 +- .../plotsquared/generator/GridPlotWorld.java | 6 +- .../plotsquared/generator/HybridGen.java | 16 +- .../generator/HybridPlotManager.java | 34 +-- .../generator/HybridPlotWorld.java | 26 +- .../plotsquared/generator/HybridUtils.java | 54 ++--- .../generator/IndependentPlotGenerator.java | 12 +- .../generator/SquarePlotManager.java | 18 +- .../generator/SquarePlotWorld.java | 8 +- .../plotsquared/listener/ExtentWrapper.java | 2 +- .../listener/PlayerBlockEventType.java | 2 +- .../plotsquared/listener/PlotListener.java | 63 +++-- .../listener/ProcessedWEExtent.java | 8 +- .../plotsquared/listener/WEExtent.java | 2 +- .../plotsquared/listener/WEManager.java | 20 +- .../plotsquared/listener/WESubscriber.java | 20 +- .../location}/BlockLoc.java | 2 +- .../location}/ChunkWrapper.java | 6 +- .../location}/Direction.java | 2 +- .../location}/Location.java | 9 +- .../location}/PlotLoc.java | 31 +-- .../plotsquared/player/ConsolePlayer.java | 20 +- .../plotsquared/player/OfflinePlotPlayer.java | 2 +- .../plotsquared/player/PlotPlayer.java | 50 ++-- .../plot}/BlockBucket.java | 14 +- .../object => plotsquared/plot}/Plot.java | 74 +++--- .../object => plotsquared/plot}/PlotArea.java | 48 ++-- .../plot}/PlotAreaTerrainType.java | 2 +- .../plot}/PlotAreaType.java | 2 +- .../plot}/PlotCluster.java | 10 +- .../plot}/PlotFilter.java | 2 +- .../plot}/PlotHandler.java | 2 +- .../object => plotsquared/plot}/PlotId.java | 12 +- .../plot}/PlotInventory.java | 8 +- .../plot}/PlotItemStack.java | 2 +- .../plot}/PlotManager.java | 9 +- .../plot}/PlotSettings.java | 6 +- .../com/plotsquared/plot/PlotWeather.java | 5 + .../object => plotsquared/plot}/Rating.java | 4 +- .../plot}/SetupObject.java | 6 +- .../plot/comment/CommentInbox.java | 12 +- .../plot/comment/CommentManager.java | 14 +- .../plotsquared/plot/comment/InboxOwner.java | 10 +- .../plotsquared/plot/comment/InboxPublic.java | 10 +- .../plotsquared/plot/comment/InboxReport.java | 10 +- .../plotsquared/plot/comment/PlotComment.java | 4 +- .../plot/expiration/ExpireManager.java | 50 ++-- .../plot/expiration/ExpiryTask.java | 12 +- .../plot/expiration/PlotAnalysis.java | 18 +- .../plotsquared/plot/flags/FlagContainer.java | 2 +- .../plot/flags/FlagParseException.java | 6 +- .../plot/flags/GlobalFlagContainer.java | 222 ++++++++++++++++++ .../plotsquared/plot/flags/InternalFlag.java | 2 +- .../plotsquared/plot/flags/PlotFlag.java | 7 +- .../flags/implementations/AnalysisFlag.java | 10 +- .../implementations/AnimalAttackFlag.java | 6 +- .../flags/implementations/AnimalCapFlag.java | 6 +- .../implementations/AnimalInteractFlag.java | 6 +- .../flags/implementations/BlockBurnFlag.java | 6 +- .../implementations/BlockIgnitionFlag.java | 6 +- .../implementations/BlockedCmdsFlag.java | 8 +- .../plot/flags/implementations/BreakFlag.java | 8 +- .../flags/implementations/CoralDryFlag.java | 8 +- .../flags/implementations/DenyExitFlag.java | 6 +- .../implementations/DenyTeleportFlag.java | 12 +- .../implementations/DescriptionFlag.java | 6 +- .../implementations/DeviceInteractFlag.java | 6 +- .../implementations/DisablePhysicsFlag.java | 6 +- .../plot/flags/implementations/DoneFlag.java | 10 +- .../implementations/DropProtectionFlag.java | 6 +- .../flags/implementations/EntityCapFlag.java | 6 +- .../flags/implementations/ExplosionFlag.java | 6 +- .../flags/implementations/FarewellFlag.java | 6 +- .../plot/flags/implementations/FeedFlag.java | 8 +- .../plot/flags/implementations/FlyFlag.java | 6 +- .../flags/implementations/ForcefieldFlag.java | 6 +- .../flags/implementations/GamemodeFlag.java | 8 +- .../flags/implementations/GrassGrowFlag.java | 6 +- .../flags/implementations/GreetingFlag.java | 6 +- .../implementations/GuestGamemodeFlag.java | 8 +- .../implementations/HangingBreakFlag.java | 6 +- .../implementations/HangingPlaceFlag.java | 6 +- .../plot/flags/implementations/HealFlag.java | 8 +- .../flags/implementations/HideInfoFlag.java | 6 +- .../implementations/HostileAttackFlag.java | 6 +- .../flags/implementations/HostileCapFlag.java | 6 +- .../implementations/HostileInteractFlag.java | 6 +- .../flags/implementations/IceFormFlag.java | 6 +- .../flags/implementations/IceMeltFlag.java | 6 +- .../flags/implementations/InstabreakFlag.java | 6 +- .../flags/implementations/InvincibleFlag.java | 6 +- .../flags/implementations/ItemDropFlag.java | 6 +- .../plot/flags/implementations/KeepFlag.java | 12 +- .../flags/implementations/KelpGrowFlag.java | 6 +- .../flags/implementations/LiquidFlowFlag.java | 6 +- .../flags/implementations/MiscBreakFlag.java | 6 +- .../flags/implementations/MiscCapFlag.java | 6 +- .../implementations/MiscInteractFlag.java | 6 +- .../flags/implementations/MiscPlaceFlag.java | 6 +- .../flags/implementations/MobBreakFlag.java | 6 +- .../flags/implementations/MobCapFlag.java | 6 +- .../flags/implementations/MobPlaceFlag.java | 6 +- .../plot/flags/implementations/MusicFlag.java | 10 +- .../flags/implementations/MycelGrowFlag.java | 6 +- .../implementations/NoWorldeditFlag.java | 6 +- .../implementations/NotifyEnterFlag.java | 6 +- .../implementations/NotifyLeaveFlag.java | 6 +- .../plot/flags/implementations/PlaceFlag.java | 8 +- .../implementations/PlayerInteractFlag.java | 6 +- .../plot/flags/implementations/PriceFlag.java | 6 +- .../plot/flags/implementations/PveFlag.java | 6 +- .../plot/flags/implementations/PvpFlag.java | 6 +- .../flags/implementations/RedstoneFlag.java | 6 +- .../flags/implementations/ServerPlotFlag.java | 6 +- .../flags/implementations/SnowFormFlag.java | 6 +- .../flags/implementations/SnowMeltFlag.java | 6 +- .../flags/implementations/SoilDryFlag.java | 6 +- .../implementations/TamedAttackFlag.java | 6 +- .../implementations/TamedInteractFlag.java | 6 +- .../plot/flags/implementations/TimeFlag.java | 6 +- .../flags/implementations/TitlesFlag.java | 8 +- .../implementations/UntrustedVisitFlag.java | 6 +- .../plot/flags/implementations/UseFlag.java | 8 +- .../implementations/VehicleBreakFlag.java | 6 +- .../flags/implementations/VehicleCapFlag.java | 6 +- .../implementations/VehiclePlaceFlag.java | 6 +- .../flags/implementations/VehicleUseFlag.java | 6 +- .../implementations/VillagerInteractFlag.java | 6 +- .../flags/implementations/VineGrowFlag.java | 6 +- .../flags/implementations/WeatherFlag.java | 8 +- .../plot/flags/types/BlockTypeListFlag.java | 10 +- .../plot/flags/types/BlockTypeWrapper.java | 2 +- .../plot/flags/types/BooleanFlag.java | 10 +- .../plot/flags/types/DoubleFlag.java | 8 +- .../plot/flags/types/IntegerFlag.java | 8 +- .../plot/flags/types/ListFlag.java | 10 +- .../plot/flags/types/LongFlag.java | 8 +- .../flags/types/NonNegativeIntegerFlag.java | 4 +- .../plot/flags/types/NumberFlag.java | 10 +- .../plot/flags/types/TimedFlag.java | 10 +- .../plot}/message/PlainChatManager.java | 8 +- .../plot}/message/PlotMessage.java | 10 +- .../plot}/schematic/PlotItem.java | 2 +- .../plot}/schematic/Schematic.java | 2 +- .../plot}/schematic/StoredEntity.java | 2 +- .../plot}/worlds/DefaultPlotAreaManager.java | 10 +- .../plot}/worlds/PlotAreaManager.java | 6 +- .../plot}/worlds/SinglePlot.java | 14 +- .../plot}/worlds/SinglePlotArea.java | 38 +-- .../plot}/worlds/SinglePlotAreaManager.java | 10 +- .../plot}/worlds/SinglePlotManager.java | 20 +- .../plot}/worlds/SingleWorldGenerator.java | 14 +- .../queue/BasicLocalBlockQueue.java | 12 +- .../plotsquared/queue/ChunkBlockQueue.java | 4 +- .../queue/DelegateLocalBlockQueue.java | 2 +- .../plotsquared/queue/GlobalBlockQueue.java | 8 +- .../plotsquared/queue/LocalBlockQueue.java | 16 +- .../queue/OffsetLocalBlockQueue.java | 2 +- .../plotsquared/queue/QueueProvider.java | 2 +- .../queue/ScopedLocalBlockQueue.java | 14 +- .../plotsquared/util/BlockUtil.java | 2 +- .../plotsquared/util/ByteArrayUtilities.java | 2 +- .../plotsquared/util/ChatManager.java | 6 +- .../plotsquared/util/ChunkManager.java | 18 +- .../plotsquared/util/ConsoleColors.java | 2 +- .../plotsquared/util/EconHandler.java | 10 +- .../plotsquared/util/EntityUtil.java | 10 +- .../plotsquared/util/EventDispatcher.java | 59 +++-- .../util}/Expression.java | 8 +- .../plotsquared/util/FileBytes.java | 2 +- .../plotsquared/util/InventoryUtil.java | 8 +- .../plotsquared/util/ItemUtil.java | 2 +- .../util}/LazyBlock.java | 2 +- .../util}/LazyResult.java | 2 +- .../plotsquared/util/LegacyConverter.java | 15 +- .../plotsquared/util/MainUtil.java | 56 ++--- .../plotsquared/util/MathMan.java | 2 +- .../plotsquared/util/OperationUtil.java | 6 +- .../plotsquared/util/PatternUtil.java | 8 +- .../plotsquared/util/Permissions.java | 11 +- .../plotsquared/util/PremiumVerification.java | 2 +- .../util}/PseudoRandom.java | 2 +- .../plotsquared/util/ReflectionUtils.java | 2 +- .../plotsquared/util/RegExUtil.java | 2 +- .../plotsquared/util/RegionUtil.java | 4 +- .../util/RuntimeExceptionRunnableVal.java | 4 +- .../plotsquared/util/SchematicHandler.java | 24 +- .../plotsquared/util/SetupUtils.java | 8 +- .../plotsquared/util/StringComparison.java | 2 +- .../plotsquared/util/StringMan.java | 4 +- .../util}/StringWrapper.java | 2 +- .../plotsquared/util/WorldUtil.java | 12 +- .../plotsquared/util/area/QuadMap.java | 4 +- .../plotsquared/util/helpmenu/HelpMenu.java | 10 +- .../plotsquared/util/helpmenu/HelpObject.java | 10 +- .../plotsquared/util/helpmenu/HelpPage.java | 12 +- .../util/logger/DelegateLogger.java | 2 +- .../com/plotsquared/util/logger/ILogger.java | 5 + .../plotsquared/util/net/HttpUtil.java | 4 +- .../plotsquared/util/net/IncendoPaster.java | 4 +- .../util/tasks/AutoClaimFinishTask.java | 24 +- .../util/tasks/ObjectTaskRunnable.java | 2 +- .../plotsquared/util/tasks/RunnableVal.java | 2 +- .../plotsquared/util/tasks/RunnableVal2.java | 2 +- .../plotsquared/util/tasks/RunnableVal3.java | 2 +- .../plotsquared/util/tasks/TaskManager.java | 6 +- .../plotsquared/util/uuid/UUIDHandler.java | 16 +- .../util/uuid/UUIDHandlerImplementation.java | 24 +- .../plotsquared/util/uuid/UUIDWrapper.java | 6 +- .../util/UUIDHandlerImplementationTest.java | 25 -- .../plotsquared/database/AbstractDBTest.java | 16 +- .../plotsquared/plot/FlagTest.java | 6 +- .../plotsquared/plot/PlotVersionTest.java | 4 +- .../plotsquared/plot/object/LocationTest.java | 3 +- .../plot/util/EventDispatcherTest.java | 35 ++- .../util/UUIDHandlerImplementationTest.java | 25 ++ buildSrc/build/libs/buildSrc.jar | Bin 0 -> 261 bytes 437 files changed, 2995 insertions(+), 2871 deletions(-) delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java delete mode 100644 Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/util => plotsquared/bukkit}/BukkitChunkManager.java (95%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/util => plotsquared/bukkit}/BukkitCommand.java (75%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/BukkitMain.java (85%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/ArrayWrapper.java (97%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/FancyMessage.java (99%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/JsonRepresentedObject.java (88%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/JsonString.java (95%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/MessagePart.java (98%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/Reflection.java (99%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/chat/TextualComponent.java (99%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/commands/DebugUUID.java (87%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/AgeableStats.java (52%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/ArmorStandStats.java (83%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/EntityBaseStats.java (67%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/EntityWrapper.java (93%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/HorseStats.java (69%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/LivingEntityStats.java (88%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/ReplicatingEntityWrapper.java (99%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/TameableStats.java (60%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit}/entity/TeleportEntityWrapper.java (96%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java (87%) create mode 100644 Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/generator/BukkitPlotGenerator.java (89%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/generator/DelegatePlotGenerator.java (80%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/generator/PlotBlockPopulator.java (65%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/ChunkListener.java (93%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/EntitySpawnListener.java (91%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/ForceFieldListener.java (84%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/PlayerEvents.java (96%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/SingleWorldListener.java (85%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/listeners/WorldEvents.java (69%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/placeholders/PlaceholderFormatter.java (69%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/placeholders/Placeholders.java (94%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit/player}/BukkitOfflinePlayer.java (85%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit/player}/BukkitPlayer.java (93%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/util => plotsquared/bukkit/schematic}/BukkitSchematicHandler.java (96%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitChatManager.java (69%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitEconHandler.java (85%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitInventoryUtil.java (90%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitSetupUtils.java (92%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitTaskManager.java (89%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/BukkitUtil.java (94%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/Metrics.java (99%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/OfflinePlayerUtil.java (81%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/SendChunk.java (84%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/SetGenCB.java (83%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/UpdateUtility.java (85%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object => plotsquared/bukkit/util/block}/BukkitBlockUtil.java (93%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/block/BukkitLocalQueue.java (93%) rename Bukkit/src/main/java/com/{github/intellectualsites => }/plotsquared/bukkit/util/block/GenChunk.java (91%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit/object/schematic => plotsquared/bukkit/util/block}/StateWrapper.java (97%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/DatFileFilter.java (77%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/DefaultUUIDWrapper.java (71%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/FileUUIDHandler.java (92%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/LowerOfflineUUIDWrapper.java (83%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/OfflineUUIDWrapper.java (86%) rename Bukkit/src/main/java/com/{github/intellectualsites/plotsquared/bukkit => plotsquared/bukkit/util}/uuid/SQLUUIDHandler.java (92%) delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/GlobalFlagContainer.java delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/TeleportCause.java delete mode 100644 Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/IPlotMain.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/Platform.java (54%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/PlotSquared.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/PlotVersion.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/api/PlotAPI.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/collection/AbstractDelegateOutputStream.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/collection/ArrayUtil.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/collection/FlatRandomCollection.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/collection/RandomCollection.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/collection/SimpleRandomCollection.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Add.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Alias.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Area.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Argument.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Auto.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Biome.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Buy.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Chat.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Claim.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Clear.java (74%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Cluster.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CmdConfirm.java (65%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CmdInstance.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Command.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CommandCaller.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CommandCategory.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CommandDeclaration.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Comment.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Condense.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Confirm.java (67%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Continue.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Copy.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/CreateRoadSchematic.java (64%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DatabaseCommand.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Debug.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugAllowUnsafe.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugClaimTest.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugExec.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugImportWorlds.java (76%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugLoadTest.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugPaste.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugRoadRegen.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/DebugSaveTest.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Delete.java (76%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Deny.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Desc.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Dislike.java (76%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Done.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Download.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/FlagCommand.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Grant.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Help.java (85%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Inbox.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Info.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Kick.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Leave.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Like.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/ListCmd.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Load.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/MainCommand.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Merge.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Middle.java (64%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Move.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Music.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Near.java (63%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Owner.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/PluginCmd.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Purge.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Rate.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/RegenAllRoads.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Relight.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Reload.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Remove.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/RequiredType.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Save.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/SchematicCmd.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Set.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/SetCommand.java (73%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/SetHome.java (74%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Setup.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/SubCommand.java (73%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Swap.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Target.java (74%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Template.java (85%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Toggle.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Trim.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Trust.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Unlink.java (74%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/Visit.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/commands/WE_Anywhere.java (81%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Caption.java (69%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/CaptionUtility.java (90%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Captions.java (99%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/ChatFormatter.java (83%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Config.java (97%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Configuration.java (96%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/ConfigurationNode.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/PlotSquaredChatFormatter.java (89%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Settings.java (99%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/StaticCaption.java (87%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot => plotsquared}/config/Storage.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/Configuration.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/ConfigurationOptions.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/ConfigurationSection.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/InvalidConfigurationException.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/MemoryConfiguration.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/MemoryConfigurationOptions.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/MemorySection.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/FileConfiguration.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/FileConfigurationOptions.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/YamlConfiguration.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/YamlConfigurationOptions.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/YamlConstructor.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/file/YamlRepresenter.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/serialization/ConfigurationSerializable.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/serialization/ConfigurationSerialization.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/serialization/DelegateDeserialization.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/configuration/serialization/SerializableAs.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/AbstractDB.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/DBFunc.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/Database.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/MySQL.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/SQLManager.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/SQLite.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/database/StmtMod.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/CancellablePlotEvent.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerAutoPlotEvent.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerClaimPlotEvent.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerEnterPlotEvent.java (62%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerLeavePlotEvent.java (64%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerPlotDeniedEvent.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerPlotHelperEvent.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerPlotTrustedEvent.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlayerTeleportToPlotEvent.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotAutoMergeEvent.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotChangeOwnerEvent.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotClearEvent.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotComponentSetEvent.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotDeleteEvent.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotDoneEvent.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotEvent.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotFlagAddEvent.java (76%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotFlagEvent.java (65%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotFlagRemoveEvent.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotMergeEvent.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotPlayerEvent.java (62%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotRateEvent.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/PlotUnlinkEvent.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/events/Result.java (95%) create mode 100644 Core/src/main/java/com/plotsquared/events/TeleportCause.java rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/AugmentedUtils.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/ClassicPlotManager.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/ClassicPlotWorld.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/GeneratorWrapper.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/GridPlotManager.java (53%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/GridPlotWorld.java (61%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/HybridGen.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/HybridPlotManager.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/HybridPlotWorld.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/HybridUtils.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/IndependentPlotGenerator.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/SquarePlotManager.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/generator/SquarePlotWorld.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/ExtentWrapper.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/PlayerBlockEventType.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/PlotListener.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/ProcessedWEExtent.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/WEExtent.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/WEManager.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/listener/WESubscriber.java (80%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/location}/BlockLoc.java (97%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/location}/ChunkWrapper.java (83%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/location}/Direction.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/location}/Location.java (96%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/location}/PlotLoc.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/player/ConsolePlayer.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/player/OfflinePlotPlayer.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/player/PlotPlayer.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/BlockBucket.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/Plot.java (98%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotArea.java (95%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotAreaTerrainType.java (94%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotAreaType.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotCluster.java (95%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotFilter.java (75%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotHandler.java (87%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotId.java (97%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotInventory.java (91%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotItemStack.java (96%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotManager.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/PlotSettings.java (95%) create mode 100644 Core/src/main/java/com/plotsquared/plot/PlotWeather.java rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/Rating.java (95%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/SetupObject.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/CommentInbox.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/CommentManager.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/InboxOwner.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/InboxPublic.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/InboxReport.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/comment/PlotComment.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/expiration/ExpireManager.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/expiration/ExpiryTask.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/expiration/PlotAnalysis.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/FlagContainer.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/FlagParseException.java (88%) create mode 100644 Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/InternalFlag.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/PlotFlag.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/AnalysisFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/AnimalAttackFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/AnimalCapFlag.java (65%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/AnimalInteractFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/BlockBurnFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java (74%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/BreakFlag.java (61%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/CoralDryFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DenyExitFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DenyTeleportFlag.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DescriptionFlag.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DeviceInteractFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DoneFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/DropProtectionFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/EntityCapFlag.java (65%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/ExplosionFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/FarewellFlag.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/FeedFlag.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/FlyFlag.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/ForcefieldFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/GamemodeFlag.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/GrassGrowFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/GreetingFlag.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HangingBreakFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HangingPlaceFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HealFlag.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HideInfoFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HostileAttackFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HostileCapFlag.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/HostileInteractFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/IceFormFlag.java (68%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/IceMeltFlag.java (68%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/InstabreakFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/InvincibleFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/ItemDropFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/KeepFlag.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/KelpGrowFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/LiquidFlowFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MiscBreakFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MiscCapFlag.java (64%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MiscInteractFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MiscPlaceFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MobBreakFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MobCapFlag.java (64%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MobPlaceFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MusicFlag.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/MycelGrowFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/NoWorldeditFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/NotifyEnterFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/PlaceFlag.java (61%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/PlayerInteractFlag.java (72%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/PriceFlag.java (65%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/PveFlag.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/PvpFlag.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/RedstoneFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/ServerPlotFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/SnowFormFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/SnowMeltFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/SoilDryFlag.java (68%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/TamedAttackFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/TamedInteractFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/TimeFlag.java (63%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/TitlesFlag.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java (67%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/UseFlag.java (61%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VehicleBreakFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VehicleCapFlag.java (66%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VehicleUseFlag.java (70%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VillagerInteractFlag.java (73%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/VineGrowFlag.java (69%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/implementations/WeatherFlag.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/BlockTypeListFlag.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/BlockTypeWrapper.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/BooleanFlag.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/DoubleFlag.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/IntegerFlag.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/ListFlag.java (68%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/LongFlag.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java (76%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/NumberFlag.java (79%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/plot/flags/types/TimedFlag.java (85%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/message/PlainChatManager.java (79%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/message/PlotMessage.java (82%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/schematic/PlotItem.java (87%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/schematic/Schematic.java (95%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/schematic/StoredEntity.java (94%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/DefaultPlotAreaManager.java (96%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/PlotAreaManager.java (85%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/SinglePlot.java (79%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/SinglePlotArea.java (82%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/SinglePlotAreaManager.java (92%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/SinglePlotManager.java (80%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/plot}/worlds/SingleWorldGenerator.java (75%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/BasicLocalBlockQueue.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/ChunkBlockQueue.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/DelegateLocalBlockQueue.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/GlobalBlockQueue.java (97%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/LocalBlockQueue.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/OffsetLocalBlockQueue.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/QueueProvider.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/queue/ScopedLocalBlockQueue.java (87%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/BlockUtil.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ByteArrayUtilities.java (81%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ChatManager.java (73%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ChunkManager.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ConsoleColors.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/EconHandler.java (75%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/EntityUtil.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/EventDispatcher.java (85%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/util}/Expression.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/FileBytes.java (78%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/InventoryUtil.java (71%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ItemUtil.java (96%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/util}/LazyBlock.java (77%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/util}/LazyResult.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/LegacyConverter.java (90%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/MainUtil.java (94%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/MathMan.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/OperationUtil.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/PatternUtil.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/Permissions.java (91%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/PremiumVerification.java (93%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/util}/PseudoRandom.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/ReflectionUtils.java (99%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/RegExUtil.java (80%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/RegionUtil.java (93%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/RuntimeExceptionRunnableVal.java (84%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/SchematicHandler.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/SetupUtils.java (61%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/StringComparison.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/StringMan.java (98%) rename Core/src/main/java/com/{github/intellectualsites/plotsquared/plot/object => plotsquared/util}/StringWrapper.java (96%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/WorldUtil.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/area/QuadMap.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/helpmenu/HelpMenu.java (83%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/helpmenu/HelpObject.java (77%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/helpmenu/HelpPage.java (73%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/logger/DelegateLogger.java (83%) create mode 100644 Core/src/main/java/com/plotsquared/util/logger/ILogger.java rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/net/HttpUtil.java (85%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/net/IncendoPaster.java (98%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/AutoClaimFinishTask.java (60%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/ObjectTaskRunnable.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/RunnableVal.java (82%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/RunnableVal2.java (86%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/RunnableVal3.java (88%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/tasks/TaskManager.java (95%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/uuid/UUIDHandler.java (89%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/uuid/UUIDHandlerImplementation.java (92%) rename Core/src/main/java/com/{github/intellectualsites => }/plotsquared/util/uuid/UUIDWrapper.java (70%) delete mode 100644 Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java rename Core/src/test/java/com/{github/intellectualsites => }/plotsquared/database/AbstractDBTest.java (89%) rename Core/src/test/java/com/{github/intellectualsites => }/plotsquared/plot/FlagTest.java (87%) rename Core/src/test/java/com/{github/intellectualsites => }/plotsquared/plot/PlotVersionTest.java (71%) rename Core/src/test/java/com/{github/intellectualsites => }/plotsquared/plot/object/LocationTest.java (86%) rename Core/src/test/java/com/{github/intellectualsites => }/plotsquared/plot/util/EventDispatcherTest.java (66%) create mode 100644 Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java create mode 100644 buildSrc/build/libs/buildSrc.jar diff --git a/Bukkit/build.gradle b/Bukkit/build.gradle index 80fa5b9ce..407c51f4e 100644 --- a/Bukkit/build.gradle +++ b/Bukkit/build.gradle @@ -45,31 +45,31 @@ processResources { //noinspection GroovyAssignabilityCheck jar.archiveFileName = "PlotSquared-BukkitAPI-${project.parent.version}.jar" -jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/" + project.parent.version) +jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-BukkitAPI/" + project.parent.version) task createPom { doLast { pom { project { - groupId = "com.github.intellectualsites.plotsquared" + groupId = "com.plotsquared" artifactId = "PlotSquared-BukkitAPI" version = project.parent.version } - }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/PlotSquared-BukkitAPI-${project.parent.version}.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/PlotSquared-BukkitAPI-${project.parent.version}.pom") pom { project { - groupId = "com.github.intellectualsites.plotsquared" + groupId = "com.plotsquared" artifactId = "PlotSquared-BukkitAPI" version = "latest" } - }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/latest/PlotSquared-BukkitAPI-latest.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/PlotSquared-BukkitAPI-latest.pom") } } task copyFiles { doLast { copy { - from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/") - into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-BukkitAPI/latest/") + from("../mvn/com/plotsquared/PlotSquared-BukkitAPI/${project.parent.version}/") + into("../mvn/com/plotsquared/PlotSquared-BukkitAPI/latest/") include("PlotSquared-BukkitAPI*.jar") rename("PlotSquared-BukkitAPI-${project.parent.version}.jar", "PlotSquared-BukkitAPI-latest.jar") } @@ -83,8 +83,8 @@ shadowJar { include(dependency("io.papermc:paperlib:1.0.2")) include(dependency("net.kyori:text-adapter-bukkit:3.0.3")) } - relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') - relocate("io.papermc.lib", "com.github.intellectualsites.plotsquared.bukkit.paperlib") + relocate('net.kyori.text', 'com.plotsquared.formatting.text') + relocate("io.papermc.lib", "com.plotsquared.bukkit.paperlib") archiveFileName = "${parent.name}-${project.name}-${parent.version}.jar" destinationDirectory = file "../target" } diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java deleted file mode 100644 index 7e00051af..000000000 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitHybridUtils.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; - -import com.github.intellectualsites.plotsquared.generator.HybridUtils; - -public class BukkitHybridUtils extends HybridUtils { - - -} diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java deleted file mode 100644 index 124108193..000000000 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitVersion.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; - -public class BukkitVersion { - public static int[] v1_13_2 = {1, 13, 2}; -} diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java similarity index 95% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java index 3046a9fd1..797f4a2c8 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChunkManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitChunkManager.java @@ -1,22 +1,22 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit; -import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; -import com.github.intellectualsites.plotsquared.bukkit.object.entity.EntityWrapper; -import com.github.intellectualsites.plotsquared.bukkit.object.entity.ReplicatingEntityWrapper; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; -import com.github.intellectualsites.plotsquared.listener.WEExtent; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.bukkit.entity.EntityWrapper; +import com.plotsquared.bukkit.entity.ReplicatingEntityWrapper; +import com.plotsquared.PlotSquared; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.generator.AugmentedUtils; +import com.plotsquared.listener.WEExtent; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.location.PlotLoc; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java similarity index 75% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java index 5d1a26f9f..b8cf6502f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitCommand.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitCommand.java @@ -1,9 +1,10 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit; -import com.github.intellectualsites.plotsquared.bukkit.commands.DebugUUID; -import com.github.intellectualsites.plotsquared.commands.MainCommand; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.bukkit.commands.DebugUUID; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.commands.MainCommand; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.player.PlotPlayer; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -48,12 +49,12 @@ public class BukkitCommand implements CommandExecutor, TabCompleter { if (args.length == 0) { return Collections.singletonList("plots"); } - Collection objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); + Collection objects = MainCommand.getInstance().tab(player, args, s.endsWith(" ")); if (objects == null) { return null; } List result = new ArrayList<>(); - for (com.github.intellectualsites.plotsquared.commands.Command o : objects) { + for (com.plotsquared.commands.Command o : objects) { result.add(o.toString()); } return result.isEmpty() ? null : result; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java similarity index 85% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java index eb98bb75e..d15246a17 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/BukkitMain.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/BukkitMain.java @@ -1,71 +1,69 @@ -package com.github.intellectualsites.plotsquared.bukkit; +package com.plotsquared.bukkit; -import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.github.intellectualsites.plotsquared.bukkit.listeners.ChunkListener; -import com.github.intellectualsites.plotsquared.bukkit.listeners.EntitySpawnListener; -import com.github.intellectualsites.plotsquared.bukkit.listeners.PlayerEvents; -import com.github.intellectualsites.plotsquared.bukkit.listeners.SingleWorldListener; -import com.github.intellectualsites.plotsquared.bukkit.listeners.WorldEvents; -import com.github.intellectualsites.plotsquared.bukkit.placeholders.PlaceholderFormatter; -import com.github.intellectualsites.plotsquared.bukkit.placeholders.Placeholders; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChatManager; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitChunkManager; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitCommand; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitEconHandler; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitHybridUtils; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitInventoryUtil; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSchematicHandler; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitSetupUtils; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitTaskManager; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.bukkit.util.Metrics; -import com.github.intellectualsites.plotsquared.bukkit.util.SetGenCB; -import com.github.intellectualsites.plotsquared.bukkit.util.UpdateUtility; -import com.github.intellectualsites.plotsquared.bukkit.util.block.BukkitLocalQueue; -import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper; -import com.github.intellectualsites.plotsquared.bukkit.uuid.FileUUIDHandler; -import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; -import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; -import com.github.intellectualsites.plotsquared.bukkit.uuid.SQLUUIDHandler; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.IPlotMain; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.generator.HybridGen; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.listener.PlotListener; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.object.message.PlainChatManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; -import com.github.intellectualsites.plotsquared.util.ChatManager; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.ConsoleColors; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.InventoryUtil; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.PremiumVerification; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.QueueProvider; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.plotsquared.bukkit.listeners.ChunkListener; +import com.plotsquared.bukkit.listeners.EntitySpawnListener; +import com.plotsquared.bukkit.listeners.PlayerEvents; +import com.plotsquared.bukkit.listeners.SingleWorldListener; +import com.plotsquared.bukkit.listeners.WorldEvents; +import com.plotsquared.bukkit.placeholders.PlaceholderFormatter; +import com.plotsquared.bukkit.placeholders.Placeholders; +import com.plotsquared.bukkit.util.BukkitChatManager; +import com.plotsquared.bukkit.util.BukkitEconHandler; +import com.plotsquared.bukkit.generator.BukkitHybridUtils; +import com.plotsquared.bukkit.util.BukkitInventoryUtil; +import com.plotsquared.bukkit.schematic.BukkitSchematicHandler; +import com.plotsquared.bukkit.util.BukkitSetupUtils; +import com.plotsquared.bukkit.util.BukkitTaskManager; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.bukkit.util.Metrics; +import com.plotsquared.bukkit.util.SetGenCB; +import com.plotsquared.bukkit.util.UpdateUtility; +import com.plotsquared.bukkit.util.block.BukkitLocalQueue; +import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; +import com.plotsquared.bukkit.util.uuid.FileUUIDHandler; +import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; +import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; +import com.plotsquared.bukkit.util.uuid.SQLUUIDHandler; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.IPlotMain; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.ChatFormatter; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.config.Settings; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.generator.HybridGen; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.listener.PlotListener; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.plot.message.PlainChatManager; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.plot.worlds.SingleWorldGenerator; +import com.plotsquared.util.ChatManager; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.ConsoleColors; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.InventoryUtil; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.PremiumVerification; +import com.plotsquared.util.ReflectionUtils; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.QueueProvider; +import com.plotsquared.util.uuid.UUIDWrapper; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.bukkit.WorldEditPlugin; import com.sk89q.worldedit.extension.platform.Actor; @@ -101,8 +99,8 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getUserID; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.util.PremiumVerification.getUserID; +import static com.plotsquared.util.ReflectionUtils.getRefClass; public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain { @@ -383,7 +381,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain case MINECART_TNT: case BOAT: if (Settings.Enabled_Components.KILL_ROAD_VEHICLES) { - com.github.intellectualsites.plotsquared.plot.object.Location + com.plotsquared.location.Location location = BukkitUtil.getLocation(entity.getLocation()); Plot plot = location.getPlot(); if (plot == null) { @@ -440,7 +438,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain PlotId originalPlotId = (PlotId) meta.get(0).value(); if (originalPlotId != null) { - com.github.intellectualsites.plotsquared.plot.object.Location + com.plotsquared.location.Location pLoc = BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { @@ -459,7 +457,7 @@ public final class BukkitMain extends JavaPlugin implements Listener, IPlotMain } } else { //This is to apply the metadata to already spawned shulkers (see EntitySpawnListener.java) - com.github.intellectualsites.plotsquared.plot.object.Location + com.plotsquared.location.Location pLoc = BukkitUtil.getLocation(entity.getLocation()); PlotArea area = pLoc.getPlotArea(); if (area != null) { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java similarity index 97% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java index 064d77d86..269588f01 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/ArrayWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/ArrayWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import org.apache.commons.lang.Validate; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java similarity index 99% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java index 348f50f9a..87ba3a85a 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/FancyMessage.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/FancyMessage.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import com.google.gson.JsonArray; import com.google.gson.JsonElement; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java similarity index 88% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java index 04f036526..a4a66d3bf 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonRepresentedObject.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonRepresentedObject.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import com.google.gson.stream.JsonWriter; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java similarity index 95% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java index 7f8dd4d29..931ab9394 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/JsonString.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/JsonString.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import com.google.gson.stream.JsonWriter; import org.bukkit.configuration.serialization.ConfigurationSerializable; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java similarity index 98% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java index 64bdda48d..4d58b1e40 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/MessagePart.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/MessagePart.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableBiMap; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java similarity index 99% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java index f3f004284..d91957907 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/Reflection.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/Reflection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java similarity index 99% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java index 14e3d2305..990916ab4 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/chat/TextualComponent.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/chat/TextualComponent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.chat; +package com.plotsquared.bukkit.chat; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java b/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java similarity index 87% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java index 3f43f5d42..4952936be 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/commands/DebugUUID.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/commands/DebugUUID.java @@ -1,27 +1,27 @@ -package com.github.intellectualsites.plotsquared.bukkit.commands; +package com.plotsquared.bukkit.commands; -import com.github.intellectualsites.plotsquared.bukkit.uuid.DatFileFilter; -import com.github.intellectualsites.plotsquared.bukkit.uuid.DefaultUUIDWrapper; -import com.github.intellectualsites.plotsquared.bukkit.uuid.LowerOfflineUUIDWrapper; -import com.github.intellectualsites.plotsquared.bukkit.uuid.OfflineUUIDWrapper; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.CommandDeclaration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.commands.RequiredType; -import com.github.intellectualsites.plotsquared.commands.SubCommand; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.bukkit.util.uuid.DatFileFilter; +import com.plotsquared.bukkit.util.uuid.DefaultUUIDWrapper; +import com.plotsquared.bukkit.util.uuid.LowerOfflineUUIDWrapper; +import com.plotsquared.bukkit.util.uuid.OfflineUUIDWrapper; +import com.plotsquared.commands.Argument; +import com.plotsquared.commands.CommandDeclaration; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.CommandCategory; +import com.plotsquared.commands.RequiredType; +import com.plotsquared.commands.SubCommand; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.Sets; import java.io.File; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java similarity index 52% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java index 5769f0e46..da10516e7 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/AgeableStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/AgeableStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; class AgeableStats { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java similarity index 83% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java index 56b36e2bb..c2382be91 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ArmorStandStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ArmorStandStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; class ArmorStandStats { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java similarity index 67% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java index c36236a5d..3e15f1a32 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityBaseStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityBaseStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; class EntityBaseStats { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java similarity index 93% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java index d0b6f28b5..10f8b10cc 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/EntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/EntityWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; import lombok.Getter; import lombok.NonNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java similarity index 69% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java index 7fd976258..13c121d3a 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/HorseStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/HorseStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; import org.bukkit.entity.Horse; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java similarity index 88% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java index c702ffaa7..3d9ce74e9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/LivingEntityStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/LivingEntityStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java similarity index 99% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java index 006afe693..f605ad39d 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/ReplicatingEntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/ReplicatingEntityWrapper.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; -import com.github.intellectualsites.plotsquared.PlotSquared; +import com.plotsquared.PlotSquared; import org.bukkit.Art; import org.bukkit.DyeColor; import org.bukkit.Location; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java similarity index 60% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java index f9e8ded36..81becf670 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TameableStats.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TameableStats.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; import org.bukkit.entity.AnimalTamer; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TeleportEntityWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java similarity index 96% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TeleportEntityWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java index 7456ae10e..e33ad399e 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/entity/TeleportEntityWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/entity/TeleportEntityWrapper.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.entity; +package com.plotsquared.bukkit.entity; -import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; +import com.plotsquared.bukkit.BukkitMain; import org.bukkit.Chunk; import org.bukkit.Location; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java similarity index 87% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java index 549fcf96e..1f6c539f9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitAugmentedGenerator.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.bukkit.generator; +package com.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; +import com.plotsquared.generator.AugmentedUtils; import org.bukkit.Chunk; import org.bukkit.World; import org.bukkit.generator.BlockPopulator; diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java new file mode 100644 index 000000000..38eadfd74 --- /dev/null +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitHybridUtils.java @@ -0,0 +1,8 @@ +package com.plotsquared.bukkit.generator; + +import com.plotsquared.generator.HybridUtils; + +public class BukkitHybridUtils extends HybridUtils { + + +} diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java similarity index 89% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java index a738c9b7c..f68bb7b06 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.bukkit.generator; +package com.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.bukkit.util.block.GenChunk; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SingleWorldGenerator; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.bukkit.util.block.GenChunk; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.location.ChunkWrapper; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.worlds.SingleWorldGenerator; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.math.BlockVector2; import lombok.Getter; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java similarity index 80% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java index e53907d3d..7d4820f8f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/DelegatePlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/DelegatePlotGenerator.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.bukkit.generator; +package com.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.MathMan; +import com.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.bukkit.BukkitAdapter; import java.util.Random; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java similarity index 65% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java index 43ad75b3d..2f24c3d39 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/generator/PlotBlockPopulator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/PlotBlockPopulator.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.bukkit.generator; +package com.plotsquared.bukkit.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.location.ChunkWrapper; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.queue.ScopedLocalBlockQueue; import java.util.Random; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java similarity index 93% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java index 57b907bb1..e8fb3c6b3 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ChunkListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ChunkListener.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.ReflectionUtils.RefClass; +import com.plotsquared.util.ReflectionUtils.RefField; +import com.plotsquared.util.ReflectionUtils.RefMethod; +import com.plotsquared.util.tasks.TaskManager; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; @@ -30,7 +30,7 @@ import org.bukkit.event.world.ChunkUnloadEvent; import java.lang.reflect.Method; import java.util.HashSet; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class ChunkListener implements Listener { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java similarity index 91% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java index 0508a9545..059278ac8 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/EntitySpawnListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/EntitySpawnListener.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; import io.papermc.lib.PaperLib; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java similarity index 84% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java index a0ab2d0b7..a2637ea7a 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/ForceFieldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/ForceFieldListener.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.implementations.ForcefieldFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.Permissions; import com.google.common.collect.Iterables; import org.bukkit.entity.Player; import org.bukkit.util.Vector; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java similarity index 96% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java index 631360bb7..cc576d64c 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/PlayerEvents.java @@ -1,33 +1,82 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; import com.destroystokyo.paper.MaterialTags; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.bukkit.util.UpdateUtility; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.github.intellectualsites.plotsquared.listener.PlayerBlockEventType; -import com.github.intellectualsites.plotsquared.listener.PlotListener; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotHandler; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.EntityUtil; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.RegExUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.bukkit.util.UpdateUtility; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.flags.implementations.AnimalAttackFlag; +import com.plotsquared.plot.flags.implementations.AnimalCapFlag; +import com.plotsquared.plot.flags.implementations.AnimalInteractFlag; +import com.plotsquared.plot.flags.implementations.BlockBurnFlag; +import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag; +import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag; +import com.plotsquared.plot.flags.implementations.BreakFlag; +import com.plotsquared.plot.flags.implementations.CoralDryFlag; +import com.plotsquared.plot.flags.implementations.DenyTeleportFlag; +import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.flags.implementations.DropProtectionFlag; +import com.plotsquared.plot.flags.implementations.EntityCapFlag; +import com.plotsquared.plot.flags.implementations.ExplosionFlag; +import com.plotsquared.plot.flags.implementations.GrassGrowFlag; +import com.plotsquared.plot.flags.implementations.HangingBreakFlag; +import com.plotsquared.plot.flags.implementations.HangingPlaceFlag; +import com.plotsquared.plot.flags.implementations.HostileAttackFlag; +import com.plotsquared.plot.flags.implementations.HostileCapFlag; +import com.plotsquared.plot.flags.implementations.HostileInteractFlag; +import com.plotsquared.plot.flags.implementations.IceFormFlag; +import com.plotsquared.plot.flags.implementations.IceMeltFlag; +import com.plotsquared.plot.flags.implementations.InstabreakFlag; +import com.plotsquared.plot.flags.implementations.InvincibleFlag; +import com.plotsquared.plot.flags.implementations.ItemDropFlag; +import com.plotsquared.plot.flags.implementations.KelpGrowFlag; +import com.plotsquared.plot.flags.implementations.LiquidFlowFlag; +import com.plotsquared.plot.flags.implementations.MiscBreakFlag; +import com.plotsquared.plot.flags.implementations.MiscCapFlag; +import com.plotsquared.plot.flags.implementations.MiscInteractFlag; +import com.plotsquared.plot.flags.implementations.MobCapFlag; +import com.plotsquared.plot.flags.implementations.MobPlaceFlag; +import com.plotsquared.plot.flags.implementations.MycelGrowFlag; +import com.plotsquared.plot.flags.implementations.PlaceFlag; +import com.plotsquared.plot.flags.implementations.PlayerInteractFlag; +import com.plotsquared.plot.flags.implementations.PveFlag; +import com.plotsquared.plot.flags.implementations.PvpFlag; +import com.plotsquared.plot.flags.implementations.RedstoneFlag; +import com.plotsquared.plot.flags.implementations.SnowFormFlag; +import com.plotsquared.plot.flags.implementations.SnowMeltFlag; +import com.plotsquared.plot.flags.implementations.SoilDryFlag; +import com.plotsquared.plot.flags.implementations.TamedAttackFlag; +import com.plotsquared.plot.flags.implementations.TamedInteractFlag; +import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; +import com.plotsquared.plot.flags.implementations.UseFlag; +import com.plotsquared.plot.flags.implementations.VehicleBreakFlag; +import com.plotsquared.plot.flags.implementations.VehicleCapFlag; +import com.plotsquared.plot.flags.implementations.VehicleUseFlag; +import com.plotsquared.plot.flags.implementations.VillagerInteractFlag; +import com.plotsquared.plot.flags.implementations.VineGrowFlag; +import com.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.listener.PlayerBlockEventType; +import com.plotsquared.listener.PlotListener; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotHandler; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotInventory; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.EntityUtil; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.RegExUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.block.BlockType; import io.papermc.lib.PaperLib; @@ -2570,7 +2619,8 @@ public class PlayerEvents extends PlotListener implements Listener { if (entity instanceof Monster && plot.getFlag(HostileInteractFlag.class)) { return; } - if ((entity instanceof Animals || entity instanceof Golem) && plot.getFlag(AnimalInteractFlag.class)) { + if ((entity instanceof Animals || entity instanceof Golem) && plot.getFlag( + AnimalInteractFlag.class)) { return; } if (entity instanceof Tameable && ((Tameable) entity).isTamed() && plot diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java similarity index 85% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java index deb6d5a16..365a04174 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/SingleWorldListener.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/SingleWorldListener.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.util.ReflectionUtils; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; @@ -17,7 +17,7 @@ import org.bukkit.plugin.Plugin; import java.lang.reflect.Field; import java.lang.reflect.Method; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.util.ReflectionUtils.getRefClass; @SuppressWarnings("unused") public class SingleWorldListener implements Listener { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java similarity index 69% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java index cfb9442b6..2b03f9c65 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/WorldEvents.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/listeners/WorldEvents.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.bukkit.listeners; +package com.plotsquared.bukkit.listeners; -import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; +import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; import org.bukkit.World; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java similarity index 69% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java index 2de08c916..0213b3eda 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/PlaceholderFormatter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/PlaceholderFormatter.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.bukkit.placeholders; +package com.plotsquared.bukkit.placeholders; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.config.ChatFormatter; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.config.ChatFormatter; +import com.plotsquared.player.PlotPlayer; import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java similarity index 94% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java index 66a5b241c..6bab8277a 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/placeholders/Placeholders.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/placeholders/Placeholders.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.bukkit.placeholders; +package com.plotsquared.bukkit.placeholders; -import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.bukkit.BukkitMain; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.uuid.UUIDHandler; import me.clip.placeholderapi.PlaceholderAPIPlugin; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java similarity index 85% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java index a2137301d..47c200e99 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitOfflinePlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitOfflinePlayer.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.bukkit.object; +package com.plotsquared.bukkit.player; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.OfflinePlotPlayer; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java similarity index 93% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java index 399e77e3c..3b082bbcb 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitPlayer.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/player/BukkitPlayer.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.bukkit.object; +package com.plotsquared.bukkit.player; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.plot.PlotWeather; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MathMan; +import com.plotsquared.plot.PlotWeather; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java similarity index 96% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java index bfee46fb2..f88b159b5 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSchematicHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/schematic/BukkitSchematicHandler.java @@ -1,12 +1,13 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.schematic; -import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.location.Location; +import com.plotsquared.bukkit.util.block.StateWrapper; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.queue.LocalBlockQueue; import com.sk89q.jnbt.*; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.platform.Capability; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java similarity index 69% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java index a6547c20b..2219d10e5 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitChatManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitChatManager.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.chat.FancyMessage; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.plotsquared.bukkit.chat.FancyMessage; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.ChatManager; import org.bukkit.ChatColor; import java.util.Arrays; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java similarity index 85% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java index 9aced7019..f0f0c4c77 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitEconHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitEconHandler.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.EconHandler; +import com.plotsquared.bukkit.player.BukkitOfflinePlayer; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.EconHandler; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java similarity index 90% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java index e6feeaeff..707386059 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitInventoryUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitInventoryUtil.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; -import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.InventoryUtil; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.plot.PlotInventory; +import com.plotsquared.plot.PlotItemStack; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.InventoryUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java similarity index 92% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java index e7b447747..155c68c1f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitSetupUtils.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitSetupUtils.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitPlotGenerator; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.plotsquared.bukkit.generator.BukkitPlotGenerator; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.util.SetupUtils; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; import org.bukkit.Chunk; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java similarity index 89% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java index 5e3a74154..8238e3ce2 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitTaskManager.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitTaskManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.bukkit.BukkitMain; +import com.plotsquared.util.tasks.TaskManager; import org.bukkit.Bukkit; public class BukkitTaskManager extends TaskManager { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java similarity index 94% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java index db6788a30..c59e84338 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/BukkitUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/BukkitUtil.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.BukkitMain; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.StringComparison; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.plotsquared.bukkit.BukkitMain; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.StringComparison; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.BlockUtil; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.bukkit.BukkitWorld; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java similarity index 99% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java index b5d53e940..b55cebcc9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/Metrics.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/Metrics.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java similarity index 81% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java index 0fbabfe7d..cab1675dd 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/OfflinePlayerUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/OfflinePlayerUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; @@ -9,15 +9,15 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; import java.util.UUID; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.callConstructor; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.callMethod; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getCbClass; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getField; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getNmsClass; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getUtilClass; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeConstructor; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeField; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.makeMethod; +import static com.plotsquared.util.ReflectionUtils.callConstructor; +import static com.plotsquared.util.ReflectionUtils.callMethod; +import static com.plotsquared.util.ReflectionUtils.getCbClass; +import static com.plotsquared.util.ReflectionUtils.getField; +import static com.plotsquared.util.ReflectionUtils.getNmsClass; +import static com.plotsquared.util.ReflectionUtils.getUtilClass; +import static com.plotsquared.util.ReflectionUtils.makeConstructor; +import static com.plotsquared.util.ReflectionUtils.makeField; +import static com.plotsquared.util.ReflectionUtils.makeMethod; public class OfflinePlayerUtil { diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java similarity index 84% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java index 10aaa5994..8bcf06ff8 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SendChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SendChunk.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefClass; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefConstructor; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefField; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils.RefMethod; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.ReflectionUtils.RefClass; +import com.plotsquared.util.ReflectionUtils.RefConstructor; +import com.plotsquared.util.ReflectionUtils.RefField; +import com.plotsquared.util.ReflectionUtils.RefMethod; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.math.BlockVector2; import io.papermc.lib.PaperLib; import org.bukkit.Bukkit; @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; -import static com.github.intellectualsites.plotsquared.util.ReflectionUtils.getRefClass; +import static com.plotsquared.util.ReflectionUtils.getRefClass; /** * An utility that can be used to send chunks, rather than using bukkit code diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java similarity index 83% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java index d549b494f..3985c0e20 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/SetGenCB.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/SetGenCB.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.bukkit.generator.BukkitAugmentedGenerator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.plotsquared.bukkit.generator.BukkitAugmentedGenerator; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.util.SetupUtils; import org.bukkit.World; import org.bukkit.generator.ChunkGenerator; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java similarity index 85% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java index 64bff6c1f..17565e392 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/UpdateUtility.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/UpdateUtility.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.bukkit.util; +package com.plotsquared.bukkit.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; import org.bukkit.Bukkit; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; @@ -35,7 +35,8 @@ public class UpdateUtility implements Listener { connection.setRequestMethod("GET"); spigotVersion = (new BufferedReader(new InputStreamReader(connection.getInputStream()))).readLine(); } catch (IOException e) { - PlotSquared.log(Captions.PREFIX + "&cUnable to check for updates because: " + e); + PlotSquared.log( + Captions.PREFIX + "&cUnable to check for updates because: " + e); this.cancel(); return; } diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitBlockUtil.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java similarity index 93% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitBlockUtil.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java index f35d4ea88..b6ac07e56 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/BukkitBlockUtil.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitBlockUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.object; +package com.plotsquared.bukkit.util.block; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java similarity index 93% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java index 4e74b187b..14f7b81f8 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/BukkitLocalQueue.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/BukkitLocalQueue.java @@ -1,11 +1,9 @@ -package com.github.intellectualsites.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.util.block; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; -import com.github.intellectualsites.plotsquared.bukkit.object.schematic.StateWrapper; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.queue.BasicLocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.util.MainUtil; +import com.plotsquared.queue.BasicLocalBlockQueue; +import com.plotsquared.util.BlockUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.EditSession; import com.sk89q.worldedit.WorldEdit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java similarity index 91% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java index ad3651bb8..7bee3a93f 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/util/block/GenChunk.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/GenChunk.java @@ -1,12 +1,11 @@ -package com.github.intellectualsites.plotsquared.bukkit.util.block; +package com.plotsquared.bukkit.util.block; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitBlockUtil; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.plot.object.ChunkWrapper; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.PatternUtil; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.location.ChunkWrapper; +import com.plotsquared.location.Location; +import com.plotsquared.util.MainUtil; +import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.util.PatternUtil; import com.google.common.base.Preconditions; import com.sk89q.worldedit.bukkit.BukkitAdapter; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java similarity index 97% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java index 03700c051..6070539f5 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/object/schematic/StateWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/block/StateWrapper.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.bukkit.object.schematic; +package com.plotsquared.bukkit.util.block; -import com.github.intellectualsites.plotsquared.bukkit.util.BukkitUtil; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; +import com.plotsquared.bukkit.util.BukkitUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; import com.sk89q.jnbt.ByteTag; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.ListTag; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DatFileFilter.java similarity index 77% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DatFileFilter.java index 2fb0892a7..596a11960 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DatFileFilter.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DatFileFilter.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; import java.io.File; import java.io.FilenameFilter; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java similarity index 71% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java index aab41402f..0952d6dd9 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/DefaultUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/DefaultUUIDWrapper.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitPlayer; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.bukkit.player.BukkitOfflinePlayer; +import com.plotsquared.bukkit.player.BukkitPlayer; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.uuid.UUIDWrapper; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java similarity index 92% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java index ad9dd4655..5daee4e44 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/FileUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/FileUUIDHandler.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import com.google.common.collect.Sets; import com.sk89q.jnbt.CompoundTag; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java similarity index 83% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java index f0031aa4d..38006f123 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/LowerOfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/LowerOfflineUUIDWrapper.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; import com.google.common.base.Charsets; import org.bukkit.OfflinePlayer; import org.jetbrains.annotations.NotNull; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java similarity index 86% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java index ac54ce972..0c9351c24 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/OfflineUUIDWrapper.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/OfflineUUIDWrapper.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; -import com.github.intellectualsites.plotsquared.bukkit.object.BukkitOfflinePlayer; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.bukkit.player.BukkitOfflinePlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.uuid.UUIDWrapper; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import org.bukkit.Bukkit; diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java similarity index 92% rename from Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java rename to Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java index d6881102c..27124023b 100644 --- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/uuid/SQLUUIDHandler.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/util/uuid/SQLUUIDHandler.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.bukkit.uuid; +package com.plotsquared.bukkit.util.uuid; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.SQLite; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.SQLite; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.util.uuid.UUIDWrapper; import com.google.common.collect.HashBiMap; import org.json.simple.JSONArray; import org.json.simple.JSONObject; diff --git a/Bukkit/src/main/resources/plugin.yml b/Bukkit/src/main/resources/plugin.yml index 6fde92971..83e711c92 100644 --- a/Bukkit/src/main/resources/plugin.yml +++ b/Bukkit/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: ${name} -main: com.github.intellectualsites.plotsquared.bukkit.BukkitMain +main: com.plotsquared.bukkit.BukkitMain api-version: "1.13" version: "${version}" load: STARTUP diff --git a/Core/build.gradle b/Core/build.gradle index a5f7c8be2..b5062a45e 100644 --- a/Core/build.gradle +++ b/Core/build.gradle @@ -35,31 +35,31 @@ processResources { //noinspection GroovyAssignabilityCheck jar.archiveFileName = "PlotSquared-CoreAPI-${project.parent.version}.jar" -jar.destinationDirectory = file("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/" + project.parent.version) +jar.destinationDirectory = file("../mvn/com/plotsquared/PlotSquared-CoreAPI/" + project.parent.version) task createPom { doLast { pom { project { - groupId = "com.github.intellectualsites.plotsquared" + groupId = "com.plotsquared" artifactId = "PlotSquared-CoreAPI" version = project.parent.version } - }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/PlotSquared-CoreAPI-${project.parent.version}.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/PlotSquared-CoreAPI-${project.parent.version}.pom") pom { project { - groupId = "com.github.intellectualsites.plotsquared" + groupId = "com.plotsquared" artifactId = "PlotSquared-CoreAPI" version = "latest" } - }.writeTo("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/latest/PlotSquared-CoreAPI-latest.pom") + }.writeTo("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/PlotSquared-CoreAPI-latest.pom") } } task copyFiles { doLast { copy { - from("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/") - into("../mvn/com/github/intellectualsites/plotsquared/PlotSquared-CoreAPI/latest/") + from("../mvn/com/plotsquared/PlotSquared-CoreAPI/${project.parent.version}/") + into("../mvn/com/plotsquared/PlotSquared-CoreAPI/latest/") include("*.jar") rename("PlotSquared-CoreAPI-${project.parent.version}.jar", "PlotSquared-CoreAPI-latest.jar") } @@ -73,7 +73,7 @@ shadowJar { include(dependency("net.kyori:text-serializer-legacy:3.0.2")) include(dependency("net.kyori:text-serializer-plain:3.0.2")) } - relocate('net.kyori.text', 'com.github.intellectualsites.plotsquared.formatting.text') + relocate('net.kyori.text', 'com.plotsquared.formatting.text') } shadowJar.doLast { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java deleted file mode 100644 index 49b9032ce..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/PlotWeather.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot; - -public enum PlotWeather { - RAIN, CLEAR, RESET -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/GlobalFlagContainer.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/GlobalFlagContainer.java deleted file mode 100644 index d1b023193..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/GlobalFlagContainer.java +++ /dev/null @@ -1,222 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.flags; - -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalAttackFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnimalInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockBurnFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockIgnitionFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.BlockedCmdsFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.BreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.CoralDryFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DenyExitFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DenyTeleportFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DeviceInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DisablePhysicsFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DropProtectionFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.EntityCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ExplosionFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.FarewellFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.FeedFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.FlyFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ForcefieldFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.GamemodeFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.GrassGrowFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.GreetingFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.GuestGamemodeFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingBreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HangingPlaceFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HealFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HideInfoFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileAttackFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HostileInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceFormFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.IceMeltFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.InstabreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.InvincibleFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ItemDropFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.KelpGrowFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.LiquidFlowFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscBreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MiscCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobBreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MobPlaceFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MusicFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MycelGrowFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.NoWorldeditFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.NotifyEnterFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.NotifyLeaveFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlaceFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PlayerInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PveFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PvpFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.RedstoneFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ServerPlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowFormFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.SnowMeltFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.SoilDryFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedAttackFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.TamedInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.TimeFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.TitlesFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.UntrustedVisitFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.UseFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleBreakFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleCapFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehiclePlaceFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VehicleUseFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VillagerInteractFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.VineGrowFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.WeatherFlag; -import lombok.Getter; - -import javax.annotation.Nonnull; -import java.util.Collections; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; - -public final class GlobalFlagContainer extends FlagContainer { - - @Getter private static final GlobalFlagContainer instance = new GlobalFlagContainer(); - private static Map> stringClassMap; - - private GlobalFlagContainer() { - super(null, (flag, type) -> { - if (type == PlotFlagUpdateType.FLAG_ADDED) { - stringClassMap.put(flag.getName().toLowerCase(Locale.ENGLISH), flag.getClass()); - } - }); - stringClassMap = new HashMap<>(); - // Register all default flags here - // Boolean flags - this.addFlag(ExplosionFlag.EXPLOSION_FALSE); - this.addFlag(UntrustedVisitFlag.UNTRUSTED_VISIT_FLAG_TRUE); - this.addFlag(DenyExitFlag.DENY_EXIT_FLAG_FALSE); - this.addFlag(DescriptionFlag.DESCRIPTION_FLAG_EMPTY); - this.addFlag(GreetingFlag.GREETING_FLAG_EMPTY); - this.addFlag(FarewellFlag.FAREWELL_FLAG_EMPTY); - this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE); - this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE); - this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE); - this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE); - this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE); - this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE); - this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE); - this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE); - this.addFlag(GrassGrowFlag.GRASS_GROW_TRUE); - this.addFlag(HangingBreakFlag.HANGING_BREAK_FALSE); - this.addFlag(HangingPlaceFlag.HANGING_PLACE_FALSE); - this.addFlag(HideInfoFlag.HIDE_INFO_FALSE); - this.addFlag(HostileAttackFlag.HOSTILE_ATTACK_FALSE); - this.addFlag(HostileInteractFlag.HOSTILE_INTERACT_FALSE); - this.addFlag(IceFormFlag.ICE_FORM_FALSE); - this.addFlag(IceMeltFlag.ICE_MELT_FALSE); - this.addFlag(KelpGrowFlag.KELP_GROW_TRUE); - this.addFlag(LiquidFlowFlag.LIQUID_FLOW_TRUE); - this.addFlag(RedstoneFlag.REDSTONE_TRUE); - this.addFlag(ServerPlotFlag.SERVER_PLOT_FALSE); - this.addFlag(MiscBreakFlag.MISC_BREAK_FALSE); - this.addFlag(MobBreakFlag.MOB_BREAK_FALSE); - this.addFlag(MobPlaceFlag.MOB_PLACE_FALSE); - this.addFlag(MycelGrowFlag.MYCEL_GROW_TRUE); - this.addFlag(NotifyEnterFlag.NOTIFY_ENTER_FALSE); - this.addFlag(NotifyLeaveFlag.NOTIFY_LEAVE_FALSE); - this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE); - this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE); - this.addFlag(PveFlag.PVE_FALSE); - this.addFlag(PvpFlag.PVP_FALSE); - this.addFlag(SnowFormFlag.SNOW_FORM_FALSE); - this.addFlag(SnowMeltFlag.SNOW_MELT_TRUE); - this.addFlag(SoilDryFlag.SOIL_DRY_FALSE); - this.addFlag(CoralDryFlag.CORAL_DRY_FALSE); - this.addFlag(TamedAttackFlag.TAMED_ATTACK_FALSE); - this.addFlag(TamedInteractFlag.TAMED_INTERACT_FALSE); - this.addFlag(VehicleBreakFlag.VEHICLE_BREAK_FALSE); - this.addFlag(VehiclePlaceFlag.VEHICLE_PLACE_FALSE); - this.addFlag(VehicleUseFlag.VEHICLE_USE_FALSE); - this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE); - this.addFlag(VineGrowFlag.VINE_GROW_TRUE); - this.addFlag(ItemDropFlag.ITEM_DROP_TRUE); - this.addFlag(InstabreakFlag.INSTABREAK_FALSE); - this.addFlag(InvincibleFlag.INVINCIBLE_FALSE); - - // Enum Flags - this.addFlag(WeatherFlag.PLOT_WEATHER_FLAG_OFF); - this.addFlag(DenyTeleportFlag.DENY_TELEPORT_FLAG_NONE); - this.addFlag(TitlesFlag.TITLES_NONE); - this.addFlag(FlyFlag.FLIGHT_FLAG_DEFAULT); - - // Integer flags - this.addFlag(AnimalCapFlag.ANIMAL_CAP_UNLIMITED); - this.addFlag(EntityCapFlag.ENTITY_CAP_UNLIMITED); - this.addFlag(HostileCapFlag.HOSTILE_CAP_UNLIMITED); - this.addFlag(MiscCapFlag.MISC_CAP_UNLIMITED); - this.addFlag(MobCapFlag.MOB_CAP_UNLIMITED); - this.addFlag(TimeFlag.TIME_DISABLED); - this.addFlag(VehicleCapFlag.VEHICLE_CAP_UNLIMITED); - - // Timed flags - this.addFlag(FeedFlag.FEED_NOTHING); - this.addFlag(HealFlag.HEAL_NOTHING); - - // Double flags - this.addFlag(PriceFlag.PRICE_NOT_BUYABLE); - - // Block type list flags - this.addFlag(BreakFlag.BREAK_NONE); - this.addFlag(PlaceFlag.PLACE_NONE); - this.addFlag(UseFlag.USE_NONE); - - // Misc - this.addFlag(GamemodeFlag.GAMEMODE_FLAG_DEFAULT); - this.addFlag(GuestGamemodeFlag.GUEST_GAMEMODE_FLAG_DEFAULT); - this.addFlag(BlockedCmdsFlag.BLOCKED_CMDS_FLAG_NONE); - this.addFlag(KeepFlag.KEEP_FLAG_FALSE); - this.addFlag(MusicFlag.MUSIC_FLAG_NONE); - - // Internal flags - this.addFlag(new AnalysisFlag(Collections.emptyList())); - this.addFlag(new DoneFlag("")); - } - - @Override public PlotFlag getFlagErased(Class flagClass) { - final PlotFlag flag = super.getFlagErased(flagClass); - if (flag != null) { - return flag; - } else { - throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types" - + " must be present in the global flag container.", flagClass.getSimpleName())); - } - } - - @Nonnull @Override - public > T getFlag(Class flagClass) { - final PlotFlag flag = super.getFlag(flagClass); - if (flag != null) { - return castUnsafe(flag); - } else { - throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types" - + " must be present in the global flag container.", flagClass.getSimpleName())); - } - } - - public Class getFlagClassFromString(final String name) { - return stringClassMap.get(name.toLowerCase(Locale.ENGLISH)); - } - - public PlotFlag getFlagFromString(final String name) { - final Class flagClass = this.getFlagClassFromString(name); - if (flagClass == null) { - return null; - } - return getFlagErased(flagClass); - } - -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/TeleportCause.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/TeleportCause.java deleted file mode 100644 index 163182468..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/TeleportCause.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.object; - -public enum TeleportCause { - COMMAND, PLUGIN, UNKNOWN -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java deleted file mode 100644 index 2f4d55e7f..000000000 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/ILogger.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.github.intellectualsites.plotsquared.util.logger; - -public interface ILogger { - void log(String message); -} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java b/Core/src/main/java/com/plotsquared/IPlotMain.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java rename to Core/src/main/java/com/plotsquared/IPlotMain.java index 218acbb90..72cd470c8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/IPlotMain.java +++ b/Core/src/main/java/com/plotsquared/IPlotMain.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared; +package com.plotsquared; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.util.logger.ILogger; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.ChatManager; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.InventoryUtil; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.QueueProvider; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.util.logger.ILogger; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.ChatManager; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.InventoryUtil; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.QueueProvider; import com.sk89q.worldedit.extension.platform.Actor; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java b/Core/src/main/java/com/plotsquared/Platform.java similarity index 54% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java rename to Core/src/main/java/com/plotsquared/Platform.java index 6265d40cc..56e765872 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/Platform.java +++ b/Core/src/main/java/com/plotsquared/Platform.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared; +package com.plotsquared; public enum Platform { Bukkit, Sponge, Spigot, Paper diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java b/Core/src/main/java/com/plotsquared/PlotSquared.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java rename to Core/src/main/java/com/plotsquared/PlotSquared.java index 4af8d149e..9a6b63559 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotSquared.java +++ b/Core/src/main/java/com/plotsquared/PlotSquared.java @@ -1,53 +1,62 @@ -package com.github.intellectualsites.plotsquared; +package com.plotsquared; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.MemorySection; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.commands.WE_Anywhere; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.config.Storage; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.database.Database; -import com.github.intellectualsites.plotsquared.database.MySQL; -import com.github.intellectualsites.plotsquared.database.SQLManager; -import com.github.intellectualsites.plotsquared.database.SQLite; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.listener.WESubscriber; -import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; -import com.github.intellectualsites.plotsquared.util.ChatManager; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.EventDispatcher; -import com.github.intellectualsites.plotsquared.util.LegacyConverter; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.logger.ILogger; -import com.github.intellectualsites.plotsquared.plot.object.*; -import com.github.intellectualsites.plotsquared.plot.object.worlds.DefaultPlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpiryTask; -import com.github.intellectualsites.plotsquared.util.InventoryUtil; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.ReflectionUtils; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.MemorySection; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.location.Location; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.WE_Anywhere; +import com.plotsquared.config.Caption; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.Settings; +import com.plotsquared.config.Storage; +import com.plotsquared.database.DBFunc; +import com.plotsquared.database.Database; +import com.plotsquared.database.MySQL; +import com.plotsquared.database.SQLManager; +import com.plotsquared.database.SQLite; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.generator.HybridPlotWorld; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.listener.WESubscriber; +import com.plotsquared.plot.comment.CommentManager; +import com.plotsquared.util.ChatManager; +import com.plotsquared.plot.BlockBucket; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotFilter; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.EventDispatcher; +import com.plotsquared.util.LegacyConverter; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.logger.ILogger; +import com.plotsquared.plot.worlds.DefaultPlotAreaManager; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.plot.expiration.ExpiryTask; +import com.plotsquared.util.InventoryUtil; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.ReflectionUtils; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java b/Core/src/main/java/com/plotsquared/PlotVersion.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java rename to Core/src/main/java/com/plotsquared/PlotVersion.java index b32d3fac3..ef76d6b2b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/PlotVersion.java +++ b/Core/src/main/java/com/plotsquared/PlotVersion.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared; +package com.plotsquared; public class PlotVersion { public final int year, month, day, hash, build; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java b/Core/src/main/java/com/plotsquared/api/PlotAPI.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java rename to Core/src/main/java/com/plotsquared/api/PlotAPI.java index 533842816..040a865e5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/api/PlotAPI.java +++ b/Core/src/main/java/com/plotsquared/api/PlotAPI.java @@ -1,19 +1,20 @@ -package com.github.intellectualsites.plotsquared.api; +package com.plotsquared.api; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.EventDispatcher; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.EventDispatcher; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.uuid.UUIDWrapper; import lombok.NoArgsConstructor; import java.util.Collections; @@ -27,7 +28,7 @@ import java.util.UUID; *
    *
  • {@link PlotPlayer}
    • *
  • {@link Plot}
    • - *
  • {@link com.github.intellectualsites.plotsquared.plot.object.Location}
    • + *
  • {@link Location}
    • *
  • {@link PlotArea}
    • *
  • {@link PlotSquared}
    • *
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java b/Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java rename to Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java index a447132af..08eadb018 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/AbstractDelegateOutputStream.java +++ b/Core/src/main/java/com/plotsquared/collection/AbstractDelegateOutputStream.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.collection; +package com.plotsquared.collection; import java.io.IOException; import java.io.OutputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java b/Core/src/main/java/com/plotsquared/collection/ArrayUtil.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java rename to Core/src/main/java/com/plotsquared/collection/ArrayUtil.java index 35a5bacab..0088574c4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/ArrayUtil.java +++ b/Core/src/main/java/com/plotsquared/collection/ArrayUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.collection; +package com.plotsquared.collection; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java b/Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java rename to Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java index b65612f46..1abc3ad11 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/FlatRandomCollection.java +++ b/Core/src/main/java/com/plotsquared/collection/FlatRandomCollection.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.collection; +package com.plotsquared.collection; -import com.github.intellectualsites.plotsquared.util.MathMan; +import com.plotsquared.util.MathMan; import java.util.ArrayList; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java b/Core/src/main/java/com/plotsquared/collection/RandomCollection.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java rename to Core/src/main/java/com/plotsquared/collection/RandomCollection.java index 01cdf71a2..205ff6f12 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/RandomCollection.java +++ b/Core/src/main/java/com/plotsquared/collection/RandomCollection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.collection; +package com.plotsquared.collection; import java.util.Map; import java.util.Random; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java b/Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java rename to Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java index 6963b47e0..b611f0f3d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/collection/SimpleRandomCollection.java +++ b/Core/src/main/java/com/plotsquared/collection/SimpleRandomCollection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.collection; +package com.plotsquared.collection; import java.util.Map; import java.util.NavigableMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java b/Core/src/main/java/com/plotsquared/commands/Add.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java rename to Core/src/main/java/com/plotsquared/commands/Add.java index 60b408e75..7a0050e32 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Add.java +++ b/Core/src/main/java/com/plotsquared/commands/Add.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java b/Core/src/main/java/com/plotsquared/commands/Alias.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java rename to Core/src/main/java/com/plotsquared/commands/Alias.java index 66f048afe..1b3afe172 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Alias.java +++ b/Core/src/main/java/com/plotsquared/commands/Alias.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; @CommandDeclaration(command = "setalias", permission = "plots.alias", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java b/Core/src/main/java/com/plotsquared/commands/Area.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java rename to Core/src/main/java/com/plotsquared/commands/Area.java index 920ae2dc5..769e3f6f6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Area.java +++ b/Core/src/main/java/com/plotsquared/commands/Area.java @@ -1,30 +1,30 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.generator.AugmentedUtils; -import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Configuration; +import com.plotsquared.generator.AugmentedUtils; +import com.plotsquared.generator.HybridPlotWorld; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java b/Core/src/main/java/com/plotsquared/commands/Argument.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java rename to Core/src/main/java/com/plotsquared/commands/Argument.java index 088dd40c1..4de4f3de9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Argument.java +++ b/Core/src/main/java/com/plotsquared/commands/Argument.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.PlotId; public abstract class Argument { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java b/Core/src/main/java/com/plotsquared/commands/Auto.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java rename to Core/src/main/java/com/plotsquared/commands/Auto.java index b207483e9..9ee02c411 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Auto.java +++ b/Core/src/main/java/com/plotsquared/commands/Auto.java @@ -1,26 +1,26 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlayerAutoPlotEvent; -import com.github.intellectualsites.plotsquared.events.PlotAutoMergeEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Expression; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.tasks.AutoClaimFinishTask; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlayerAutoPlotEvent; +import com.plotsquared.events.PlotAutoMergeEvent; +import com.plotsquared.events.Result; +import com.plotsquared.util.Expression; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.tasks.AutoClaimFinishTask; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.primitives.Ints; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java b/Core/src/main/java/com/plotsquared/commands/Biome.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java rename to Core/src/main/java/com/plotsquared/commands/Biome.java index 309850047..bfdae31b6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Biome.java +++ b/Core/src/main/java/com/plotsquared/commands/Biome.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java b/Core/src/main/java/com/plotsquared/commands/Buy.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java rename to Core/src/main/java/com/plotsquared/commands/Buy.java index 31af85eb6..33ba10e6d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Buy.java +++ b/Core/src/main/java/com/plotsquared/commands/Buy.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.PriceFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.Set; import java.util.concurrent.CompletableFuture; @@ -63,7 +63,8 @@ public class Buy extends Command { Captions.PLOT_SOLD.send(owner, plot.getId(), player.getName(), price); } PlotFlag plotFlag = plot.getFlagContainer().getFlag(PriceFlag.class); - PlotFlagRemoveEvent event = PlotSquared.get().getEventDispatcher().callFlagRemove(plotFlag, plot); + PlotFlagRemoveEvent + event = PlotSquared.get().getEventDispatcher().callFlagRemove(plotFlag, plot); if(event.getEventResult() != Result.DENY) { plot.removeFlag(event.getFlag()); } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java b/Core/src/main/java/com/plotsquared/commands/Chat.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java rename to Core/src/main/java/com/plotsquared/commands/Chat.java index a2774a81d..cb1cac449 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Chat.java +++ b/Core/src/main/java/com/plotsquared/commands/Chat.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "chat", description = "Toggle plot chat on or off", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java b/Core/src/main/java/com/plotsquared/commands/Claim.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java rename to Core/src/main/java/com/plotsquared/commands/Claim.java index acc135bc3..5bc5a1261 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Claim.java +++ b/Core/src/main/java/com/plotsquared/commands/Claim.java @@ -1,20 +1,24 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlayerClaimPlotEvent; -import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.*; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlayerClaimPlotEvent; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.Result; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.tasks.RunnableVal; import com.google.common.primitives.Ints; +import com.plotsquared.location.Direction; +import com.plotsquared.util.Expression; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; @CommandDeclaration(command = "claim", aliases = "c", @@ -35,7 +39,8 @@ public class Claim extends SubCommand { if (plot == null) { return sendMessage(player, Captions.NOT_IN_PLOT); } - PlayerClaimPlotEvent event = PlotSquared.get().getEventDispatcher().callClaim(player, plot, schematic); + PlayerClaimPlotEvent + event = PlotSquared.get().getEventDispatcher().callClaim(player, plot, schematic); schematic = event.getSchematic(); if (event.getEventResult() == Result.DENY) { sendMessage(player, Captions.EVENT_DENIED, "Claim"); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java b/Core/src/main/java/com/plotsquared/commands/Clear.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java rename to Core/src/main/java/com/plotsquared/commands/Clear.java index 172bfe783..836c7a012 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Clear.java +++ b/Core/src/main/java/com/plotsquared/commands/Clear.java @@ -1,24 +1,24 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.AnalysisFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.queue.GlobalBlockQueue; import java.util.concurrent.CompletableFuture; -import static com.github.intellectualsites.plotsquared.commands.SubCommand.sendMessage; +import static com.plotsquared.commands.SubCommand.sendMessage; @CommandDeclaration(command = "clear", description = "Clear the plot you stand on", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java b/Core/src/main/java/com/plotsquared/commands/Cluster.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java rename to Core/src/main/java/com/plotsquared/commands/Cluster.java index e4d7a508b..5c9cbe220 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Cluster.java +++ b/Core/src/main/java/com/plotsquared/commands/Cluster.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java b/Core/src/main/java/com/plotsquared/commands/CmdConfirm.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java rename to Core/src/main/java/com/plotsquared/commands/CmdConfirm.java index 9b88d4db2..37e314231 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdConfirm.java +++ b/Core/src/main/java/com/plotsquared/commands/CmdConfirm.java @@ -1,10 +1,9 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.commands.CmdInstance; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; public class CmdConfirm { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java b/Core/src/main/java/com/plotsquared/commands/CmdInstance.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java rename to Core/src/main/java/com/plotsquared/commands/CmdInstance.java index 83120c749..545c3e3a1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CmdInstance.java +++ b/Core/src/main/java/com/plotsquared/commands/CmdInstance.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; public class CmdInstance { public final Runnable command; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java b/Core/src/main/java/com/plotsquared/commands/Command.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java rename to Core/src/main/java/com/plotsquared/commands/Command.java index acbfcf6c7..f7aa077ed 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Command.java +++ b/Core/src/main/java/com/plotsquared/commands/Command.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringComparison; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringComparison; +import com.plotsquared.util.StringMan; import java.io.IOException; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java b/Core/src/main/java/com/plotsquared/commands/CommandCaller.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java rename to Core/src/main/java/com/plotsquared/commands/CommandCaller.java index 21af7e52c..0cecb9b05 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCaller.java +++ b/Core/src/main/java/com/plotsquared/commands/CommandCaller.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; public interface CommandCaller { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java b/Core/src/main/java/com/plotsquared/commands/CommandCategory.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java rename to Core/src/main/java/com/plotsquared/commands/CommandCategory.java index 62194c83c..889d7781c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandCategory.java +++ b/Core/src/main/java/com/plotsquared/commands/CommandCategory.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; +import com.plotsquared.config.Captions; import lombok.RequiredArgsConstructor; /** diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java b/Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java rename to Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java index b517c2b35..aaf0831bc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CommandDeclaration.java +++ b/Core/src/main/java/com/plotsquared/commands/CommandDeclaration.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java b/Core/src/main/java/com/plotsquared/commands/Comment.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java rename to Core/src/main/java/com/plotsquared/commands/Comment.java index 654c67b70..9488cbeb3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Comment.java +++ b/Core/src/main/java/com/plotsquared/commands/Comment.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.comment.CommentInbox; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.comment.CommentInbox; +import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.comment.CommentManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.Arrays; import java.util.Locale; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java b/Core/src/main/java/com/plotsquared/commands/Condense.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java rename to Core/src/main/java/com/plotsquared/commands/Condense.java index 296c1e895..8162f82d9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Condense.java +++ b/Core/src/main/java/com/plotsquared/commands/Condense.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.WorldUtil; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java b/Core/src/main/java/com/plotsquared/commands/Confirm.java similarity index 67% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java rename to Core/src/main/java/com/plotsquared/commands/Confirm.java index 475cbb7ba..1f1cccadd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Confirm.java +++ b/Core/src/main/java/com/plotsquared/commands/Confirm.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "confirm", permission = "plots.use", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java b/Core/src/main/java/com/plotsquared/commands/Continue.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java rename to Core/src/main/java/com/plotsquared/commands/Continue.java index 584c972e2..5bf60149e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Continue.java +++ b/Core/src/main/java/com/plotsquared/commands/Continue.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; @CommandDeclaration(command = "continue", description = "Continue a plot that was previously marked as done", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java b/Core/src/main/java/com/plotsquared/commands/Copy.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java rename to Core/src/main/java/com/plotsquared/commands/Copy.java index 9119ca20e..158d04de2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Copy.java +++ b/Core/src/main/java/com/plotsquared/commands/Copy.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; @CommandDeclaration(command = "copy", permission = "plots.copy", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java b/Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java similarity index 64% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java rename to Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java index dffdd7ccc..b3b2a1b6d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/CreateRoadSchematic.java +++ b/Core/src/main/java/com/plotsquared/commands/CreateRoadSchematic.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.generator.HybridPlotWorld; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.generator.HybridPlotWorld; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "createroadschematic", aliases = {"crs"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java b/Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java rename to Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java index 58835316a..11ecbf17b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DatabaseCommand.java +++ b/Core/src/main/java/com/plotsquared/commands/DatabaseCommand.java @@ -1,17 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.database.MySQL; -import com.github.intellectualsites.plotsquared.database.SQLManager; -import com.github.intellectualsites.plotsquared.database.SQLite; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.database.DBFunc; +import com.plotsquared.database.MySQL; +import com.plotsquared.database.SQLManager; +import com.plotsquared.database.SQLite; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.database.Database; import java.io.File; import java.sql.SQLException; @@ -67,7 +68,7 @@ public class DatabaseCommand extends SubCommand { return false; } try { - com.github.intellectualsites.plotsquared.database.Database implementation; + Database implementation; String prefix = ""; switch (args[0].toLowerCase()) { case "import": diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java b/Core/src/main/java/com/plotsquared/commands/Debug.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java rename to Core/src/main/java/com/plotsquared/commands/Debug.java index d3eacff9f..5cbcc407f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Debug.java +++ b/Core/src/main/java/com/plotsquared/commands/Debug.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java b/Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java rename to Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java index fd65b258d..064e2adec 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugAllowUnsafe.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugAllowUnsafe.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java b/Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java rename to Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java index 2ba91cdca..59a1a2ef8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugClaimTest.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugClaimTest.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; import com.google.common.collect.BiMap; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java b/Core/src/main/java/com/plotsquared/commands/DebugExec.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java rename to Core/src/main/java/com/plotsquared/commands/DebugExec.java index afa9b45c2..6d67d5b57 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugExec.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugExec.java @@ -1,39 +1,39 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.listener.WEManager; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.listener.WEManager; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.location.Location; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.plot.expiration.PlotAnalysis; import com.google.common.io.Files; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java b/Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java rename to Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java index 4621b41bc..27ee77a53 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugImportWorlds.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugImportWorlds.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; import com.google.common.base.Charsets; import java.io.File; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java b/Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java rename to Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java index f7577adcc..6e9465845 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugLoadTest.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugLoadTest.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.database.DBFunc; +import com.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "debugloadtest", permission = "plots.debugloadtest", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java b/Core/src/main/java/com/plotsquared/commands/DebugPaste.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java rename to Core/src/main/java/com/plotsquared/commands/DebugPaste.java index 521ecfc34..17038308d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugPaste.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugPaste.java @@ -1,15 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.net.IncendoPaster; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.net.IncendoPaster; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import com.plotsquared.util.PremiumVerification; import lombok.NonNull; import java.io.BufferedReader; @@ -24,9 +25,6 @@ import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getDownloadID; -import static com.github.intellectualsites.plotsquared.util.PremiumVerification.getUserID; - @CommandDeclaration(command = "debugpaste", aliases = "dp", usage = "/plot debugpaste", @@ -59,7 +57,8 @@ public class DebugPaste extends SubCommand { + "problem\n\n"); b.append("# PlotSquared Information\n"); b.append("This PlotSquared version is licensed to the spigot user ") - .append(getUserID()).append(" under ").append(getDownloadID()).append("\n"); + .append(PremiumVerification.getUserID()).append(" under ").append( + PremiumVerification.getDownloadID()).append("\n"); b.append("# Server Information\n"); b.append("Server Version: ").append(PlotSquared.get().IMP.getServerImplementation()) .append("\n"); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java b/Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java rename to Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java index a1c9e0597..7077c4dd4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugRoadRegen.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugRoadRegen.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.generator.HybridPlotManager; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.generator.HybridPlotManager; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java b/Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java rename to Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java index 272079bd6..b82de8132 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/DebugSaveTest.java +++ b/Core/src/main/java/com/plotsquared/commands/DebugSaveTest.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java b/Core/src/main/java/com/plotsquared/commands/Delete.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java rename to Core/src/main/java/com/plotsquared/commands/Delete.java index 05face8a8..91b15d523 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Delete.java +++ b/Core/src/main/java/com/plotsquared/commands/Delete.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Expression; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.Result; +import com.plotsquared.util.Expression; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "delete", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java b/Core/src/main/java/com/plotsquared/commands/Deny.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java rename to Core/src/main/java/com/plotsquared/commands/Deny.java index 55b607f01..e46765873 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Deny.java +++ b/Core/src/main/java/com/plotsquared/commands/Deny.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; import com.sk89q.worldedit.world.gamemode.GameModes; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java b/Core/src/main/java/com/plotsquared/commands/Desc.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java rename to Core/src/main/java/com/plotsquared/commands/Desc.java index 7f032060c..84db895ae 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Desc.java +++ b/Core/src/main/java/com/plotsquared/commands/Desc.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.implementations.DescriptionFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "setdescription", permission = "plots.set.desc", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java b/Core/src/main/java/com/plotsquared/commands/Dislike.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java rename to Core/src/main/java/com/plotsquared/commands/Dislike.java index c21057398..e6bd95b70 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Dislike.java +++ b/Core/src/main/java/com/plotsquared/commands/Dislike.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "dislike", permission = "plots.dislike", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java b/Core/src/main/java/com/plotsquared/commands/Done.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java rename to Core/src/main/java/com/plotsquared/commands/Done.java index d6770aac8..2e60b3369 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Done.java +++ b/Core/src/main/java/com/plotsquared/commands/Done.java @@ -1,22 +1,22 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotDoneEvent; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotDoneEvent; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.plot.expiration.PlotAnalysis; @CommandDeclaration(command = "done", aliases = {"submit"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java b/Core/src/main/java/com/plotsquared/commands/Download.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java rename to Core/src/main/java/com/plotsquared/commands/Download.java index de2a47b9c..e5508d654 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Download.java +++ b/Core/src/main/java/com/plotsquared/commands/Download.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.WorldUtil; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java b/Core/src/main/java/com/plotsquared/commands/FlagCommand.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java rename to Core/src/main/java/com/plotsquared/commands/FlagCommand.java index 38d122271..36c609adb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/FlagCommand.java +++ b/Core/src/main/java/com/plotsquared/commands/FlagCommand.java @@ -1,30 +1,30 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.IntegerFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.ListFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringComparison; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.helpmenu.HelpMenu; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.InternalFlag; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.types.IntegerFlag; +import com.plotsquared.plot.flags.types.ListFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringComparison; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.helpmenu.HelpMenu; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java b/Core/src/main/java/com/plotsquared/commands/Grant.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java rename to Core/src/main/java/com/plotsquared/commands/Grant.java index 361801552..310a5e7e0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Grant.java +++ b/Core/src/main/java/com/plotsquared/commands/Grant.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; import com.google.common.primitives.Ints; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java b/Core/src/main/java/com/plotsquared/commands/Help.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java rename to Core/src/main/java/com/plotsquared/commands/Help.java index a0e098ab6..e1dc76168 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Help.java +++ b/Core/src/main/java/com/plotsquared/commands/Help.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.helpmenu.HelpMenu; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.helpmenu.HelpMenu; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java b/Core/src/main/java/com/plotsquared/commands/Inbox.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java rename to Core/src/main/java/com/plotsquared/commands/Inbox.java index 9b9f59958..12fd0ddf7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Inbox.java +++ b/Core/src/main/java/com/plotsquared/commands/Inbox.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.comment.CommentInbox; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.comment.CommentInbox; +import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.comment.CommentManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java b/Core/src/main/java/com/plotsquared/commands/Info.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java rename to Core/src/main/java/com/plotsquared/commands/Info.java index 87d4e46f2..42d4f9223 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Info.java +++ b/Core/src/main/java/com/plotsquared/commands/Info.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.HideInfoFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.flags.implementations.HideInfoFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "info", aliases = "i", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java b/Core/src/main/java/com/plotsquared/commands/Kick.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java rename to Core/src/main/java/com/plotsquared/commands/Kick.java index a1e1bb7f9..49682aeb9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Kick.java +++ b/Core/src/main/java/com/plotsquared/commands/Kick.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; import java.util.HashSet; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java b/Core/src/main/java/com/plotsquared/commands/Leave.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java rename to Core/src/main/java/com/plotsquared/commands/Leave.java index 7ab523de6..93bea9587 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Leave.java +++ b/Core/src/main/java/com/plotsquared/commands/Leave.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; import java.util.UUID; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java b/Core/src/main/java/com/plotsquared/commands/Like.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java rename to Core/src/main/java/com/plotsquared/commands/Like.java index d276d4c78..19b8b2e57 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Like.java +++ b/Core/src/main/java/com/plotsquared/commands/Like.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotRateEvent; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Rating; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotRateEvent; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Rating; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java b/Core/src/main/java/com/plotsquared/commands/ListCmd.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java rename to Core/src/main/java/com/plotsquared/commands/ListCmd.java index b04a44d8d..1f2d92d14 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/ListCmd.java +++ b/Core/src/main/java/com/plotsquared/commands/ListCmd.java @@ -1,25 +1,25 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.PlotSquared.SortType; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.PriceFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Rating; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringComparison; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.PlotSquared.SortType; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.flags.implementations.PriceFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Rating; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringComparison; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.plot.expiration.ExpireManager; import java.util.ArrayList; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java b/Core/src/main/java/com/plotsquared/commands/Load.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java rename to Core/src/main/java/com/plotsquared/commands/Load.java index 0f2db9da4..b9f126394 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Load.java +++ b/Core/src/main/java/com/plotsquared/commands/Load.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.schematic.Schematic; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.tasks.TaskManager; import java.net.MalformedURLException; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java b/Core/src/main/java/com/plotsquared/commands/MainCommand.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java rename to Core/src/main/java/com/plotsquared/commands/MainCommand.java index 3dcd7759b..49cb77a92 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/MainCommand.java +++ b/Core/src/main/java/com/plotsquared/commands/MainCommand.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.Expression; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.util.Expression; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.Permissions; import java.util.Arrays; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java b/Core/src/main/java/com/plotsquared/commands/Merge.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java rename to Core/src/main/java/com/plotsquared/commands/Merge.java index bbe78943e..3b4f1ce0e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Merge.java +++ b/Core/src/main/java/com/plotsquared/commands/Merge.java @@ -1,26 +1,24 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Direction; -import com.github.intellectualsites.plotsquared.plot.object.Expression; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.Result; +import com.plotsquared.location.Direction; +import com.plotsquared.util.Expression; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.UUID; -import static com.github.intellectualsites.plotsquared.plot.object.Direction.getFromIndex; - @CommandDeclaration(command = "merge", aliases = "m", description = "Merge the plot you are standing on with another plot", @@ -85,7 +83,7 @@ public class Merge extends SubCommand { } else { for (int i = 0; i < values.length; i++) { if (args[0].equalsIgnoreCase(values[i]) || args[0].equalsIgnoreCase(aliases[i])) { - direction = getFromIndex(i); + direction = Direction.getFromIndex(i); break; } } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java b/Core/src/main/java/com/plotsquared/commands/Middle.java similarity index 64% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java rename to Core/src/main/java/com/plotsquared/commands/Middle.java index 120d34dba..4f1bce01c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Middle.java +++ b/Core/src/main/java/com/plotsquared/commands/Middle.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.events.TeleportCause; /** * @author manuelgu, altered by Citymonstret diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java b/Core/src/main/java/com/plotsquared/commands/Move.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java rename to Core/src/main/java/com/plotsquared/commands/Move.java index fbba1f2d4..5e62c7e03 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Move.java +++ b/Core/src/main/java/com/plotsquared/commands/Move.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java b/Core/src/main/java/com/plotsquared/commands/Music.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java rename to Core/src/main/java/com/plotsquared/commands/Music.java index 9123874cf..1e957714e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Music.java +++ b/Core/src/main/java/com/plotsquared/commands/Music.java @@ -1,13 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.MusicFlag; -import com.github.intellectualsites.plotsquared.plot.object.*; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.MusicFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotInventory; +import com.plotsquared.plot.PlotItemStack; import com.sk89q.worldedit.world.item.ItemTypes; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java b/Core/src/main/java/com/plotsquared/commands/Near.java similarity index 63% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java rename to Core/src/main/java/com/plotsquared/commands/Near.java index a805cdd1d..d25433496 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Near.java +++ b/Core/src/main/java/com/plotsquared/commands/Near.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.StringMan; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java b/Core/src/main/java/com/plotsquared/commands/Owner.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java rename to Core/src/main/java/com/plotsquared/commands/Owner.java index 4ac3532c6..e3bd9196a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Owner.java +++ b/Core/src/main/java/com/plotsquared/commands/Owner.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotChangeOwnerEvent; -import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotChangeOwnerEvent; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.tasks.TaskManager; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java b/Core/src/main/java/com/plotsquared/commands/PluginCmd.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java rename to Core/src/main/java/com/plotsquared/commands/PluginCmd.java index a7c258cdf..bc76598f3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/PluginCmd.java +++ b/Core/src/main/java/com/plotsquared/commands/PluginCmd.java @@ -1,11 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; - -import static com.github.intellectualsites.plotsquared.util.PremiumVerification.isPremium; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.PremiumVerification; @CommandDeclaration(command = "plugin", permission = "plots.use", @@ -24,7 +23,7 @@ public class PluginCmd extends SubCommand { "$2>> $1&lAuthors$2: $1Citymonstret $2& $1Empire92 $2& $1MattBDev $2& $1dordsor21 $2& $1NotMyFault"); MainUtil.sendMessage(player, "$2>> $1&lWiki$2: $1https://github.com/IntellectualSites/PlotSquared/wiki"); - MainUtil.sendMessage(player, "$2>> $1&lPremium$2: $1" + isPremium()); + MainUtil.sendMessage(player, "$2>> $1&lPremium$2: $1" + PremiumVerification.isPremium()); }); return true; } diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java b/Core/src/main/java/com/plotsquared/commands/Purge.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java rename to Core/src/main/java/com/plotsquared/commands/Purge.java index 45c114730..bce21cd7d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Purge.java +++ b/Core/src/main/java/com/plotsquared/commands/Purge.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.listener.PlotListener; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.listener.PlotListener; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.HashMap; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java b/Core/src/main/java/com/plotsquared/commands/Rate.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java rename to Core/src/main/java/com/plotsquared/commands/Rate.java index e03ca3670..5402411b8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Rate.java +++ b/Core/src/main/java/com/plotsquared/commands/Rate.java @@ -1,21 +1,21 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotRateEvent; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; -import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Rating; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotRateEvent; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotInventory; +import com.plotsquared.plot.PlotItemStack; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Rating; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java b/Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java rename to Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java index c5cdbd4d9..b84cab1ff 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RegenAllRoads.java +++ b/Core/src/main/java/com/plotsquared/commands/RegenAllRoads.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.generator.HybridPlotManager; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.generator.HybridPlotManager; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "regenallroads", description = "Regenerate all roads in the map using the set road schematic", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java b/Core/src/main/java/com/plotsquared/commands/Relight.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java rename to Core/src/main/java/com/plotsquared/commands/Relight.java index 17920a2d4..c82aa7ab0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Relight.java +++ b/Core/src/main/java/com/plotsquared/commands/Relight.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.queue.LocalBlockQueue; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java b/Core/src/main/java/com/plotsquared/commands/Reload.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java rename to Core/src/main/java/com/plotsquared/commands/Reload.java index 090a12aec..68b8a0d22 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Reload.java +++ b/Core/src/main/java/com/plotsquared/commands/Reload.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.MemorySection; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.MemorySection; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; import java.io.IOException; import java.util.Objects; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java b/Core/src/main/java/com/plotsquared/commands/Remove.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java rename to Core/src/main/java/com/plotsquared/commands/Remove.java index 2ac7d34da..f3aceaee9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Remove.java +++ b/Core/src/main/java/com/plotsquared/commands/Remove.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java b/Core/src/main/java/com/plotsquared/commands/RequiredType.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java rename to Core/src/main/java/com/plotsquared/commands/RequiredType.java index e8181a066..ce7bd841a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/RequiredType.java +++ b/Core/src/main/java/com/plotsquared/commands/RequiredType.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; public enum RequiredType { CONSOLE, PLAYER, NONE; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java b/Core/src/main/java/com/plotsquared/commands/Save.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java rename to Core/src/main/java/com/plotsquared/commands/Save.java index d42dac8aa..61e92cd1d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Save.java +++ b/Core/src/main/java/com/plotsquared/commands/Save.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.jnbt.CompoundTag; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java b/Core/src/main/java/com/plotsquared/commands/SchematicCmd.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java rename to Core/src/main/java/com/plotsquared/commands/SchematicCmd.java index 7358f599a..7a314bb00 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SchematicCmd.java +++ b/Core/src/main/java/com/plotsquared/commands/SchematicCmd.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.schematic.Schematic; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.collect.Lists; import java.net.URL; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java b/Core/src/main/java/com/plotsquared/commands/Set.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java rename to Core/src/main/java/com/plotsquared/commands/Set.java index 88847028a..6d7e7a2a2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Set.java +++ b/Core/src/main/java/com/plotsquared/commands/Set.java @@ -1,15 +1,15 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.util.PatternUtil; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringMan; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.util.PatternUtil; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java b/Core/src/main/java/com/plotsquared/commands/SetCommand.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java rename to Core/src/main/java/com/plotsquared/commands/SetCommand.java index c5e88351c..b9688d592 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetCommand.java +++ b/Core/src/main/java/com/plotsquared/commands/SetCommand.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringMan; public abstract class SetCommand extends SubCommand { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java b/Core/src/main/java/com/plotsquared/commands/SetHome.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java rename to Core/src/main/java/com/plotsquared/commands/SetHome.java index 63e757412..0a35af561 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SetHome.java +++ b/Core/src/main/java/com/plotsquared/commands/SetHome.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "sethome", permission = "plots.set.home", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java b/Core/src/main/java/com/plotsquared/commands/Setup.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java rename to Core/src/main/java/com/plotsquared/commands/Setup.java index 8091e1863..593b0dd5c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Setup.java +++ b/Core/src/main/java/com/plotsquared/commands/Setup.java @@ -1,22 +1,22 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.WorldUtil; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java b/Core/src/main/java/com/plotsquared/commands/SubCommand.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java rename to Core/src/main/java/com/plotsquared/commands/SubCommand.java index e48ab2f69..8c6edef27 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/SubCommand.java +++ b/Core/src/main/java/com/plotsquared/commands/SubCommand.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java b/Core/src/main/java/com/plotsquared/commands/Swap.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java rename to Core/src/main/java/com/plotsquared/commands/Swap.java index 868f3a5a9..5b81e56e6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Swap.java +++ b/Core/src/main/java/com/plotsquared/commands/Swap.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; import java.util.concurrent.CompletableFuture; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java b/Core/src/main/java/com/plotsquared/commands/Target.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java rename to Core/src/main/java/com/plotsquared/commands/Target.java index 472c48f88..2643cede3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Target.java +++ b/Core/src/main/java/com/plotsquared/commands/Target.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; @CommandDeclaration(command = "target", usage = "/plot target <|nearest>", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java b/Core/src/main/java/com/plotsquared/commands/Template.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java rename to Core/src/main/java/com/plotsquared/commands/Template.java index ea6ff3977..226dbb1de 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Template.java +++ b/Core/src/main/java/com/plotsquared/commands/Template.java @@ -1,23 +1,23 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.util.FileBytes; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.InvalidConfigurationException; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.config.Settings; +import com.plotsquared.util.FileBytes; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.GlobalBlockQueue; import java.io.File; import java.io.FileInputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java b/Core/src/main/java/com/plotsquared/commands/Toggle.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java rename to Core/src/main/java/com/plotsquared/commands/Toggle.java index e2c65f052..82ed24592 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Toggle.java +++ b/Core/src/main/java/com/plotsquared/commands/Toggle.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; @CommandDeclaration(command = "toggle", aliases = {"attribute"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java b/Core/src/main/java/com/plotsquared/commands/Trim.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java rename to Core/src/main/java/com/plotsquared/commands/Trim.java index 6a73a8d03..72c64d67e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trim.java +++ b/Core/src/main/java/com/plotsquared/commands/Trim.java @@ -1,20 +1,20 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java b/Core/src/main/java/com/plotsquared/commands/Trust.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java rename to Core/src/main/java/com/plotsquared/commands/Trust.java index 8abea79f2..2a1c65882 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Trust.java +++ b/Core/src/main/java/com/plotsquared/commands/Trust.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; import java.util.Iterator; import java.util.Set; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java b/Core/src/main/java/com/plotsquared/commands/Unlink.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java rename to Core/src/main/java/com/plotsquared/commands/Unlink.java index 7453acdf4..22746a91b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Unlink.java +++ b/Core/src/main/java/com/plotsquared/commands/Unlink.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.events.Result; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; @CommandDeclaration(command = "unlink", aliases = {"u", "unmerge"}, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java b/Core/src/main/java/com/plotsquared/commands/Visit.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java rename to Core/src/main/java/com/plotsquared/commands/Visit.java index 0b3cd83d1..757b539dc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/Visit.java +++ b/Core/src/main/java/com/plotsquared/commands/Visit.java @@ -1,19 +1,19 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.UntrustedVisitFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java b/Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java rename to Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java index 6714905ab..39aa9e768 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/commands/WE_Anywhere.java +++ b/Core/src/main/java/com/plotsquared/commands/WE_Anywhere.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.commands; +package com.plotsquared.commands; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.PlotPlayer; @CommandDeclaration(command = "weanywhere", permission = "plots.worldedit.bypass", diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java b/Core/src/main/java/com/plotsquared/config/Caption.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java rename to Core/src/main/java/com/plotsquared/config/Caption.java index c5a2f5014..d938016f2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Caption.java +++ b/Core/src/main/java/com/plotsquared/config/Caption.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringMan; public interface Caption { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java b/Core/src/main/java/com/plotsquared/config/CaptionUtility.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java rename to Core/src/main/java/com/plotsquared/config/CaptionUtility.java index 55888073c..a3eed50e8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/CaptionUtility.java +++ b/Core/src/main/java/com/plotsquared/config/CaptionUtility.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.PlotPlayer; public class CaptionUtility { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java b/Core/src/main/java/com/plotsquared/config/Captions.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java rename to Core/src/main/java/com/plotsquared/config/Captions.java index e64a0d65c..35a8f0aa9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Captions.java +++ b/Core/src/main/java/com/plotsquared/config/Captions.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.util.StringMan; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java b/Core/src/main/java/com/plotsquared/config/ChatFormatter.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java rename to Core/src/main/java/com/plotsquared/config/ChatFormatter.java index a3789f6f6..518889b70 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/config/ChatFormatter.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.PlotPlayer; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java b/Core/src/main/java/com/plotsquared/config/Config.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java rename to Core/src/main/java/com/plotsquared/config/Config.java index a9e8a8335..eaf5eef78 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Config.java +++ b/Core/src/main/java/com/plotsquared/config/Config.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.configuration.MemorySection; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings.Enabled_Components; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.configuration.MemorySection; +import com.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings.Enabled_Components; +import com.plotsquared.util.StringMan; import java.io.File; import java.io.PrintWriter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java b/Core/src/main/java/com/plotsquared/config/Configuration.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java rename to Core/src/main/java/com/plotsquared/config/Configuration.java index 1fa167177..8508514fe 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Configuration.java +++ b/Core/src/main/java/com/plotsquared/config/Configuration.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; +import com.plotsquared.plot.BlockBucket; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.biome.BiomeTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java b/Core/src/main/java/com/plotsquared/config/ConfigurationNode.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java rename to Core/src/main/java/com/plotsquared/config/ConfigurationNode.java index 79c8a113d..bb7ed962f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/ConfigurationNode.java +++ b/Core/src/main/java/com/plotsquared/config/ConfigurationNode.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.plot.BlockBucket; +import com.plotsquared.util.StringMan; import com.sk89q.worldedit.world.block.BlockState; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java b/Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java rename to Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java index 8a1aa9dc9..ea84034bd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/PlotSquaredChatFormatter.java +++ b/Core/src/main/java/com/plotsquared/config/PlotSquaredChatFormatter.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.util.StringMan; import java.util.LinkedHashMap; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java b/Core/src/main/java/com/plotsquared/config/Settings.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java rename to Core/src/main/java/com/plotsquared/config/Settings.java index 319bca775..efe786ec6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Settings.java +++ b/Core/src/main/java/com/plotsquared/config/Settings.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; -import com.github.intellectualsites.plotsquared.configuration.file.YamlConfiguration; +import com.plotsquared.configuration.file.YamlConfiguration; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/StaticCaption.java b/Core/src/main/java/com/plotsquared/config/StaticCaption.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/StaticCaption.java rename to Core/src/main/java/com/plotsquared/config/StaticCaption.java index fec3589df..97e740e02 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/StaticCaption.java +++ b/Core/src/main/java/com/plotsquared/config/StaticCaption.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java b/Core/src/main/java/com/plotsquared/config/Storage.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java rename to Core/src/main/java/com/plotsquared/config/Storage.java index 962e0468f..dfc9543c1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/config/Storage.java +++ b/Core/src/main/java/com/plotsquared/config/Storage.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.config; +package com.plotsquared.config; import java.io.File; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java b/Core/src/main/java/com/plotsquared/configuration/Configuration.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java rename to Core/src/main/java/com/plotsquared/configuration/Configuration.java index c2b4b4d95..74e4549eb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/Configuration.java +++ b/Core/src/main/java/com/plotsquared/configuration/Configuration.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java b/Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java index 81c96196d..482f0ac00 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/configuration/ConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java b/Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java rename to Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java index 0752dfb57..834828ef3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/ConfigurationSection.java +++ b/Core/src/main/java/com/plotsquared/configuration/ConfigurationSection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; import java.util.List; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java b/Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java rename to Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java index e9c099ed1..518f9d4f7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/InvalidConfigurationException.java +++ b/Core/src/main/java/com/plotsquared/configuration/InvalidConfigurationException.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; /** * Exception thrown when attempting to load an invalid {@link Configuration}. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java b/Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java rename to Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java index 20131cbe1..cc1527be8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfiguration.java +++ b/Core/src/main/java/com/plotsquared/configuration/MemoryConfiguration.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java b/Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java index 22f9d751b..7bd1b5c5a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemoryConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/configuration/MemoryConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java b/Core/src/main/java/com/plotsquared/configuration/MemorySection.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java rename to Core/src/main/java/com/plotsquared/configuration/MemorySection.java index 14233b758..260a15b50 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/MemorySection.java +++ b/Core/src/main/java/com/plotsquared/configuration/MemorySection.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration; +package com.plotsquared.configuration; import java.util.ArrayList; import java.util.LinkedHashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java b/Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java rename to Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java index e8123cfc9..bcfef26fa 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfiguration.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/FileConfiguration.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; -import com.github.intellectualsites.plotsquared.configuration.Configuration; -import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; -import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration; +import com.plotsquared.configuration.Configuration; +import com.plotsquared.configuration.InvalidConfigurationException; +import com.plotsquared.configuration.MemoryConfiguration; import java.io.BufferedReader; import java.io.File; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java b/Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java index 6eb99bb6e..23336ffa2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/FileConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/FileConfigurationOptions.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; -import com.github.intellectualsites.plotsquared.configuration.Configuration; -import com.github.intellectualsites.plotsquared.configuration.MemoryConfiguration; -import com.github.intellectualsites.plotsquared.configuration.MemoryConfigurationOptions; +import com.plotsquared.configuration.Configuration; +import com.plotsquared.configuration.MemoryConfiguration; +import com.plotsquared.configuration.MemoryConfigurationOptions; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java b/Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java rename to Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java index 9acc01233..145632a9c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfiguration.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/YamlConfiguration.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; -import com.github.intellectualsites.plotsquared.configuration.Configuration; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.InvalidConfigurationException; -import com.github.intellectualsites.plotsquared.PlotSquared; +import com.plotsquared.configuration.Configuration; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.InvalidConfigurationException; +import com.plotsquared.PlotSquared; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; import org.yaml.snakeyaml.error.YAMLException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java b/Core/src/main/java/com/plotsquared/configuration/file/YamlConfigurationOptions.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java rename to Core/src/main/java/com/plotsquared/configuration/file/YamlConfigurationOptions.java index a7e71cdaf..2a9674d52 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConfigurationOptions.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/YamlConfigurationOptions.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; /** * Various settings for controlling the input and output of a {@link diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java b/Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java rename to Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java index 1f52f7abb..85c30bd20 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlConstructor.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/YamlConstructor.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; -import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.constructor.SafeConstructor; import org.yaml.snakeyaml.error.YAMLException; import org.yaml.snakeyaml.nodes.Node; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java b/Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java rename to Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java index ebe1aebee..63c1cb5ee 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/file/YamlRepresenter.java +++ b/Core/src/main/java/com/plotsquared/configuration/file/YamlRepresenter.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.configuration.file; +package com.plotsquared.configuration.file; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable; -import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerialization; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.configuration.serialization.ConfigurationSerializable; +import com.plotsquared.configuration.serialization.ConfigurationSerialization; import org.yaml.snakeyaml.nodes.Node; import org.yaml.snakeyaml.representer.Representer; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java b/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java rename to Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java index f83e7a468..bbafa8fd8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerializable.java +++ b/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerializable.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration.serialization; +package com.plotsquared.configuration.serialization; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java b/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java rename to Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java index cb1abd54a..0e124470e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/ConfigurationSerialization.java +++ b/Core/src/main/java/com/plotsquared/configuration/serialization/ConfigurationSerialization.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.configuration.serialization; +package com.plotsquared.configuration.serialization; -import com.github.intellectualsites.plotsquared.configuration.Configuration; +import com.plotsquared.configuration.Configuration; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java b/Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java rename to Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java index 8a071cb2e..b0b79d30d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/DelegateDeserialization.java +++ b/Core/src/main/java/com/plotsquared/configuration/serialization/DelegateDeserialization.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration.serialization; +package com.plotsquared.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java b/Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java rename to Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java index 79b50998c..dd60ff5ae 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/configuration/serialization/SerializableAs.java +++ b/Core/src/main/java/com/plotsquared/configuration/serialization/SerializableAs.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.configuration.serialization; +package com.plotsquared.configuration.serialization; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java b/Core/src/main/java/com/plotsquared/database/AbstractDB.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java rename to Core/src/main/java/com/plotsquared/database/AbstractDB.java index 84dcf9053..7624be327 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/AbstractDB.java +++ b/Core/src/main/java/com/plotsquared/database/AbstractDB.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java b/Core/src/main/java/com/plotsquared/database/DBFunc.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java rename to Core/src/main/java/com/plotsquared/database/DBFunc.java index 93052b63c..7b46c870a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/DBFunc.java +++ b/Core/src/main/java/com/plotsquared/database/DBFunc.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.comment.PlotComment; import java.sql.ResultSet; import java.sql.ResultSetMetaData; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java b/Core/src/main/java/com/plotsquared/database/Database.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java rename to Core/src/main/java/com/plotsquared/database/Database.java index e2d2a2978..7a3d57622 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/Database.java +++ b/Core/src/main/java/com/plotsquared/database/Database.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; import java.sql.Connection; import java.sql.ResultSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java b/Core/src/main/java/com/plotsquared/database/MySQL.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java rename to Core/src/main/java/com/plotsquared/database/MySQL.java index f5e91134e..811873b72 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/MySQL.java +++ b/Core/src/main/java/com/plotsquared/database/MySQL.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.config.Storage; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.Storage; +import com.plotsquared.util.StringMan; import java.sql.Connection; import java.sql.DriverManager; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java b/Core/src/main/java/com/plotsquared/database/SQLManager.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java rename to Core/src/main/java/com/plotsquared/database/SQLManager.java index c87382565..3580736d7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLManager.java +++ b/Core/src/main/java/com/plotsquared/database/SQLManager.java @@ -1,25 +1,25 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.config.Storage; -import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotSettings; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.config.Storage; +import com.plotsquared.plot.flags.FlagContainer; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotSettings; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.base.Charsets; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java b/Core/src/main/java/com/plotsquared/database/SQLite.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java rename to Core/src/main/java/com/plotsquared/database/SQLite.java index 90c8884f7..31bf46793 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/SQLite.java +++ b/Core/src/main/java/com/plotsquared/database/SQLite.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.PlotSquared; +import com.plotsquared.PlotSquared; import java.io.File; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java b/Core/src/main/java/com/plotsquared/database/StmtMod.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java rename to Core/src/main/java/com/plotsquared/database/StmtMod.java index 3888c9d61..321bce397 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/database/StmtMod.java +++ b/Core/src/main/java/com/plotsquared/database/StmtMod.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.util.StringMan; import java.sql.PreparedStatement; import java.sql.SQLException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java b/Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java rename to Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java index a1c1e0bc2..41660445c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/CancellablePlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/CancellablePlotEvent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; /** * PlotSquared event with {@link Result} to cancel, force, or allow. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java index ca498884a..db173a474 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerAutoPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerAutoPlotEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.commands.Claim; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.Claim; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java index fb5bcff01..c33d1ecc2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerClaimPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerClaimPlotEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.commands.Claim; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.Claim; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import javax.annotation.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java similarity index 62% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java index 6cb7c3072..cf39e6642 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerEnterPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerEnterPlotEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; public class PlayerEnterPlotEvent extends PlotPlayerEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java similarity index 64% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java index e4566a8eb..85a205af3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerLeavePlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerLeavePlotEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; /** * diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java index b0d80e3c5..31c800b82 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotDeniedEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerPlotDeniedEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java index 50aa76f75..68633cbd8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotHelperEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerPlotHelperEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java index 26ad73849..253c92700 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerPlotTrustedEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerPlotTrustedEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java index ac46553d0..074b93f9b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlayerTeleportToPlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlayerTeleportToPlotEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; /** * Called when a player teleports to a plot diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java b/Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java index 79b8df894..88fb212df 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotAutoMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotAutoMergeEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java b/Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java index 599dcdd3a..a47b2100b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotChangeOwnerEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotChangeOwnerEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; +import com.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.Nullable; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java b/Core/src/main/java/com/plotsquared/events/PlotClearEvent.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotClearEvent.java index f528ed0c1..db0285f40 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotClearEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotClearEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; /** * Called when a plot is cleared diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java b/Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java index 0a7ac757e..02c90ce05 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotComponentSetEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotComponentSetEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; import com.sk89q.worldedit.function.pattern.Pattern; /** diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java b/Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java index ed40a1822..55c7408d0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDeleteEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotDeleteEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; /** * Called when a plot is deleted diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java b/Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java index 0aa3a3ec1..2c5523c0c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotDoneEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotDoneEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotId; /** * Called when a plot is cleared diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java b/Core/src/main/java/com/plotsquared/events/PlotEvent.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotEvent.java index 7ab8ad7b0..0a255f5a7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotEvent.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.plot.Plot; import org.jetbrains.annotations.NotNull; public abstract class PlotEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java b/Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java index 563616c66..c145e6fc6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagAddEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotFlagAddEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; /** * Called when a Flag is added to a plot. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java b/Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java index 10df3f06b..c3572dc73 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotFlagEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; public abstract class PlotFlagEvent extends PlotEvent { private final PlotFlag flag; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java b/Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java index 5022dbf9f..ec4c60d16 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotFlagRemoveEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotFlagRemoveEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; /** * Called when a flag is removed from a plot diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java b/Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java index 6a3604b7f..4906d8e78 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotMergeEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotMergeEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Direction; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.location.Direction; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java b/Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java similarity index 62% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java index 9b372b1f9..fc65ad771 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotPlayerEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotPlayerEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; public abstract class PlotPlayerEvent extends PlotEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java b/Core/src/main/java/com/plotsquared/events/PlotRateEvent.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotRateEvent.java index d5ea31d48..2b8ac5d12 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotRateEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotRateEvent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Rating; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.Rating; import org.jetbrains.annotations.Nullable; public class PlotRateEvent extends PlotEvent implements CancellablePlotEvent { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java b/Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java rename to Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java index 1bea0d608..66786d854 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/PlotUnlinkEvent.java +++ b/Core/src/main/java/com/plotsquared/events/PlotUnlinkEvent.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java b/Core/src/main/java/com/plotsquared/events/Result.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java rename to Core/src/main/java/com/plotsquared/events/Result.java index 745f36db7..a83f8f214 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/events/Result.java +++ b/Core/src/main/java/com/plotsquared/events/Result.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.events; +package com.plotsquared.events; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/plotsquared/events/TeleportCause.java b/Core/src/main/java/com/plotsquared/events/TeleportCause.java new file mode 100644 index 000000000..51fc9a1be --- /dev/null +++ b/Core/src/main/java/com/plotsquared/events/TeleportCause.java @@ -0,0 +1,5 @@ +package com.plotsquared.events; + +public enum TeleportCause { + COMMAND, PLUGIN, UNKNOWN +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java b/Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java rename to Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java index 2d80f0033..35ed3cd65 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/plotsquared/generator/AugmentedUtils.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.queue.DelegateLocalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.queue.DelegateLocalBlockQueue; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java b/Core/src/main/java/com/plotsquared/generator/ClassicPlotManager.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java rename to Core/src/main/java/com/plotsquared/generator/ClassicPlotManager.java index 2e150205c..7f42e63b3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotManager.java +++ b/Core/src/main/java/com/plotsquared/generator/ClassicPlotManager.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.plot.object.Direction; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.BlockBucket; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.MathMan; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.util.BlockUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.block.BlockTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java b/Core/src/main/java/com/plotsquared/generator/ClassicPlotWorld.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java rename to Core/src/main/java/com/plotsquared/generator/ClassicPlotWorld.java index 1de9f6440..c81c09abb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/generator/ClassicPlotWorld.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.BlockBucket; +import com.plotsquared.plot.PlotId; import com.sk89q.worldedit.world.block.BlockTypes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java b/Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java rename to Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java index b3258bc51..599860f8c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GeneratorWrapper.java +++ b/Core/src/main/java/com/plotsquared/generator/GeneratorWrapper.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.plotsquared.plot.PlotArea; public interface GeneratorWrapper { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java b/Core/src/main/java/com/plotsquared/generator/GridPlotManager.java similarity index 53% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java rename to Core/src/main/java/com/plotsquared/generator/GridPlotManager.java index e40d94aa9..682e7cdb2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/generator/GridPlotManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; /** * A plot manager where plots tessellate in a grid formation symmetrical about x=z. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java b/Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java similarity index 61% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java rename to Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java index 37c4c1665..7a0ac8416 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/GridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/generator/GridPlotWorld.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; import org.jetbrains.annotations.NotNull; public abstract class GridPlotWorld extends PlotArea { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java b/Core/src/main/java/com/plotsquared/generator/HybridGen.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java rename to Core/src/main/java/com/plotsquared/generator/HybridGen.java index 462cf6e89..6ac0e5b1f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridGen.java +++ b/Core/src/main/java/com/plotsquared/generator/HybridGen.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.MathMan; +import com.plotsquared.queue.ScopedLocalBlockQueue; import com.google.common.base.Preconditions; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java b/Core/src/main/java/com/plotsquared/generator/HybridPlotManager.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java rename to Core/src/main/java/com/plotsquared/generator/HybridPlotManager.java index 463f0dbf4..796457385 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/plotsquared/generator/HybridPlotManager.java @@ -1,21 +1,21 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.Template; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.util.FileBytes; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.Template; +import com.plotsquared.config.Settings; +import com.plotsquared.util.FileBytes; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.util.BlockUtil; import com.google.common.collect.Sets; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java b/Core/src/main/java/com/plotsquared/generator/HybridPlotWorld.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java rename to Core/src/main/java/com/plotsquared/generator/HybridPlotWorld.java index 4889774e8..6b9ca522b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridPlotWorld.java +++ b/Core/src/main/java/com/plotsquared/generator/HybridPlotWorld.java @@ -1,17 +1,17 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.plot.schematic.Schematic; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.SchematicHandler; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.CompoundTagBuilder; import com.sk89q.worldedit.extent.clipboard.Clipboard; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java b/Core/src/main/java/com/plotsquared/generator/HybridUtils.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java rename to Core/src/main/java/com/plotsquared/generator/HybridUtils.java index 568cc26f8..013c6d9e4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/HybridUtils.java +++ b/Core/src/main/java/com/plotsquared/generator/HybridUtils.java @@ -1,31 +1,31 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.listener.WEExtent; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.ChunkBlockQueue; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.AnalysisFlag; +import com.plotsquared.listener.WEExtent; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.ChunkBlockQueue; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.util.RegionUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java b/Core/src/main/java/com/plotsquared/generator/IndependentPlotGenerator.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java rename to Core/src/main/java/com/plotsquared/generator/IndependentPlotGenerator.java index ff3fdb3dd..5cba454cb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/IndependentPlotGenerator.java +++ b/Core/src/main/java/com/plotsquared/generator/IndependentPlotGenerator.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.queue.ScopedLocalBlockQueue; /** * This class allows for implementation independent world generation. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java b/Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java rename to Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java index df67826a5..cc150e662 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotManager.java +++ b/Core/src/main/java/com/plotsquared/generator/SquarePlotManager.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Direction; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java b/Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java rename to Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java index 159982e8c..362fe15a8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/generator/SquarePlotWorld.java +++ b/Core/src/main/java/com/plotsquared/generator/SquarePlotWorld.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.generator; +package com.plotsquared.generator; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.PlotId; import org.jetbrains.annotations.NotNull; public abstract class SquarePlotWorld extends GridPlotWorld { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java b/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java rename to Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java index 9ad193110..175f95237 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ExtentWrapper.java +++ b/Core/src/main/java/com/plotsquared/listener/ExtentWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; import com.sk89q.worldedit.extent.AbstractDelegateExtent; import com.sk89q.worldedit.extent.Extent; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java b/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java rename to Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java index 3fccbfb83..66a7ec42d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlayerBlockEventType.java +++ b/Core/src/main/java/com/plotsquared/listener/PlayerBlockEventType.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; public enum PlayerBlockEventType { // Non interactive diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java b/Core/src/main/java/com/plotsquared/listener/PlotListener.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java rename to Core/src/main/java/com/plotsquared/listener/PlotListener.java index dafb9b503..437dbe9da 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/PlotListener.java +++ b/Core/src/main/java/com/plotsquared/listener/PlotListener.java @@ -1,29 +1,42 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.PlotWeather; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.PlotFlagRemoveEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; -import com.github.intellectualsites.plotsquared.plot.flags.types.TimedFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.comment.CommentManager; -import com.github.intellectualsites.plotsquared.util.ByteArrayUtilities; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.PlotWeather; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DenyExitFlag; +import com.plotsquared.plot.flags.implementations.FarewellFlag; +import com.plotsquared.plot.flags.implementations.FeedFlag; +import com.plotsquared.plot.flags.implementations.FlyFlag; +import com.plotsquared.plot.flags.implementations.GamemodeFlag; +import com.plotsquared.plot.flags.implementations.GreetingFlag; +import com.plotsquared.plot.flags.implementations.GuestGamemodeFlag; +import com.plotsquared.plot.flags.implementations.HealFlag; +import com.plotsquared.plot.flags.implementations.MusicFlag; +import com.plotsquared.plot.flags.implementations.NotifyEnterFlag; +import com.plotsquared.plot.flags.implementations.NotifyLeaveFlag; +import com.plotsquared.plot.flags.implementations.TimeFlag; +import com.plotsquared.plot.flags.implementations.TitlesFlag; +import com.plotsquared.plot.flags.implementations.WeatherFlag; +import com.plotsquared.plot.flags.types.TimedFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.comment.CommentManager; +import com.plotsquared.util.ByteArrayUtilities; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java b/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java rename to Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java index 2031d6606..2f626f139 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/ProcessedWEExtent.java +++ b/Core/src/main/java/com/plotsquared/listener/ProcessedWEExtent.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java b/Core/src/main/java/com/plotsquared/listener/WEExtent.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java rename to Core/src/main/java/com/plotsquared/listener/WEExtent.java index 18f2d4801..5d6e75030 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEExtent.java +++ b/Core/src/main/java/com/plotsquared/listener/WEExtent.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; import com.sk89q.worldedit.WorldEditException; import com.sk89q.worldedit.entity.BaseEntity; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java b/Core/src/main/java/com/plotsquared/listener/WEManager.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java rename to Core/src/main/java/com/plotsquared/listener/WEManager.java index 69b08692c..5f1bc2c49 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WEManager.java +++ b/Core/src/main/java/com/plotsquared/listener/WEManager.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.NoWorldeditFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.flags.implementations.NoWorldeditFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java rename to Core/src/main/java/com/plotsquared/listener/WESubscriber.java index 0d7f21efb..75c49fcb9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/listener/WESubscriber.java +++ b/Core/src/main/java/com/plotsquared/listener/WESubscriber.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.listener; +package com.plotsquared.listener; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.Permissions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; import com.sk89q.worldedit.event.extent.EditSessionEvent; @@ -40,8 +40,8 @@ public class WESubscriber { if (plotPlayer == null) { Player player = (Player) actor; Location location = player.getLocation(); - com.github.intellectualsites.plotsquared.plot.object.Location pLoc = - new com.github.intellectualsites.plotsquared.plot.object.Location( + com.plotsquared.location.Location pLoc = + new com.plotsquared.location.Location( player.getWorld().getName(), location.getBlockX(), location.getBlockX(), location.getBlockZ()); Plot plot = pLoc.getPlot(); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java b/Core/src/main/java/com/plotsquared/location/BlockLoc.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java rename to Core/src/main/java/com/plotsquared/location/BlockLoc.java index ab531d633..91a45b9c9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockLoc.java +++ b/Core/src/main/java/com/plotsquared/location/BlockLoc.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.location; public class BlockLoc { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java b/Core/src/main/java/com/plotsquared/location/ChunkWrapper.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java rename to Core/src/main/java/com/plotsquared/location/ChunkWrapper.java index 3229ef841..0a03a1563 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/ChunkWrapper.java +++ b/Core/src/main/java/com/plotsquared/location/ChunkWrapper.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.location; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.StringMan; public class ChunkWrapper { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java b/Core/src/main/java/com/plotsquared/location/Direction.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java rename to Core/src/main/java/com/plotsquared/location/Direction.java index 3c3900dc1..6feabf8ab 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Direction.java +++ b/Core/src/main/java/com/plotsquared/location/Direction.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.location; public enum Direction { ALL(-1, "all"), NORTH(0, "north"), EAST(1, "east"), SOUTH(2, "south"), WEST(3, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java b/Core/src/main/java/com/plotsquared/location/Location.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java rename to Core/src/main/java/com/plotsquared/location/Location.java index d34496799..905fbc36f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Location.java +++ b/Core/src/main/java/com/plotsquared/location/Location.java @@ -1,7 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.location; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.util.MathMan; +import com.plotsquared.PlotSquared; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.util.MathMan; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import lombok.Getter; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java b/Core/src/main/java/com/plotsquared/location/PlotLoc.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java rename to Core/src/main/java/com/plotsquared/location/PlotLoc.java index 09b3cbe3e..72b8efcd9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotLoc.java +++ b/Core/src/main/java/com/plotsquared/location/PlotLoc.java @@ -1,41 +1,24 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.location; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.util.StringMan; import lombok.AllArgsConstructor; import org.jetbrains.annotations.Nullable; +//todo better description needed /** * (x,y,z) or (x,z) representation for PlotSquared (hence the "Plot" prefix) */ @AllArgsConstructor public final class PlotLoc { - /** - * Use the getter - * - * @see #getX() - * @deprecated - */ - @Deprecated public int x; - /** - * Use the getter - * - * @see #getY() - * @deprecated - */ - @Deprecated public int y; - /** - * Use the getter - * - * @see #getZ() - * @deprecated - */ - @Deprecated public int z; + private final int x; + private final int y; + private final int z; /** * Initialize a new {@link PlotLoc} and set the Y value to {@code -1} * * @param x X value - * @param z Y value + * @param z Z value */ public PlotLoc(final int x, final int z) { this(x, -1, z); diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java b/Core/src/main/java/com/plotsquared/player/ConsolePlayer.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java rename to Core/src/main/java/com/plotsquared/player/ConsolePlayer.java index f6d497506..edc3c1b7a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/ConsolePlayer.java +++ b/Core/src/main/java/com/plotsquared/player/ConsolePlayer.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.player; +package com.plotsquared.player; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.RequiredType; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.PlotWeather; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.RequiredType; +import com.plotsquared.database.DBFunc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.plot.PlotWeather; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.regions.CuboidRegion; import com.sk89q.worldedit.world.gamemode.GameMode; @@ -83,8 +83,8 @@ public class ConsolePlayer extends PlotPlayer { } @Override public void teleport(Location location, TeleportCause cause) { - setMeta(PlotPlayer.META_LAST_PLOT, location.getPlot()); - setMeta(PlotPlayer.META_LOCATION, location); + setMeta(META_LAST_PLOT, location.getPlot()); + setMeta(META_LOCATION, location); } @Override public boolean isOnline() { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java b/Core/src/main/java/com/plotsquared/player/OfflinePlotPlayer.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java rename to Core/src/main/java/com/plotsquared/player/OfflinePlotPlayer.java index 7776faa14..d2d54710b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/OfflinePlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/player/OfflinePlotPlayer.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.player; +package com.plotsquared.player; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java b/Core/src/main/java/com/plotsquared/player/PlotPlayer.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java rename to Core/src/main/java/com/plotsquared/player/PlotPlayer.java index 929d0788e..726984b01 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/player/PlotPlayer.java +++ b/Core/src/main/java/com/plotsquared/player/PlotPlayer.java @@ -1,29 +1,29 @@ -package com.github.intellectualsites.plotsquared.player; +package com.plotsquared.player; -import com.github.intellectualsites.plotsquared.commands.CommandCaller; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.RequiredType; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.TeleportCause; -import com.github.intellectualsites.plotsquared.plot.object.worlds.PlotAreaManager; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotAreaManager; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.plot.PlotWeather; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.commands.CommandCaller; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.RequiredType; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.plot.worlds.PlotAreaManager; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.plot.worlds.SinglePlotAreaManager; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.Permissions; +import com.plotsquared.plot.PlotWeather; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.util.tasks.RunnableVal; import com.google.common.base.Preconditions; import com.sk89q.worldedit.extension.platform.Actor; import com.sk89q.worldedit.world.gamemode.GameMode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java b/Core/src/main/java/com/plotsquared/plot/BlockBucket.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java rename to Core/src/main/java/com/plotsquared/plot/BlockBucket.java index 16f6b4283..a082a5670 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/BlockBucket.java +++ b/Core/src/main/java/com/plotsquared/plot/BlockBucket.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.configuration.serialization.ConfigurationSerializable; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.BlockUtil; -import com.github.intellectualsites.plotsquared.util.PatternUtil; +import com.plotsquared.configuration.serialization.ConfigurationSerializable; +import com.plotsquared.config.Configuration; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.BlockUtil; +import com.plotsquared.util.PatternUtil; import com.google.common.collect.ImmutableMap; import com.sk89q.worldedit.function.pattern.BlockPattern; import com.sk89q.worldedit.function.pattern.Pattern; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/plotsquared/plot/Plot.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java rename to Core/src/main/java/com/plotsquared/plot/Plot.java index 3c5c43ab2..38c1c8c1d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java +++ b/Core/src/main/java/com/plotsquared/plot/Plot.java @@ -1,37 +1,43 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotComponentSetEvent; -import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag; -import com.github.intellectualsites.plotsquared.generator.SquarePlotWorld; -import com.github.intellectualsites.plotsquared.listener.PlotListener; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; -import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.util.ChunkManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.Permissions; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.expiration.PlotAnalysis; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.events.TeleportCause; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.PlotLoc; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotComponentSetEvent; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.FlagContainer; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.InternalFlag; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.KeepFlag; +import com.plotsquared.generator.SquarePlotWorld; +import com.plotsquared.listener.PlotListener; +import com.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.schematic.Schematic; +import com.plotsquared.util.ChunkManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.Permissions; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.plot.expiration.PlotAnalysis; +import com.plotsquared.util.tasks.RunnableVal; import com.google.common.collect.BiMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -71,7 +77,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.stream.Collectors; -import static com.github.intellectualsites.plotsquared.commands.SubCommand.sendMessage; +import static com.plotsquared.commands.SubCommand.sendMessage; /** * The plot class
diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/plotsquared/plot/PlotArea.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java rename to Core/src/main/java/com/plotsquared/plot/PlotArea.java index 6c9191620..83b3cacb5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotArea.java @@ -1,26 +1,30 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.generator.GridPlotWorld; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.util.EconHandler; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.area.QuadMap; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.PlotLoc; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.FlagContainer; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.generator.GridPlotWorld; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.util.EconHandler; +import com.plotsquared.util.Expression; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.area.QuadMap; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.util.RegionUtil; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaTerrainType.java b/Core/src/main/java/com/plotsquared/plot/PlotAreaTerrainType.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaTerrainType.java rename to Core/src/main/java/com/plotsquared/plot/PlotAreaTerrainType.java index 5bbc79b1e..2834da83a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaTerrainType.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotAreaTerrainType.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; import java.util.Map; import java.util.Optional; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaType.java b/Core/src/main/java/com/plotsquared/plot/PlotAreaType.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaType.java rename to Core/src/main/java/com/plotsquared/plot/PlotAreaType.java index 6f825fcb1..d37dcace6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotAreaType.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotAreaType.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; import java.util.Map; import java.util.Optional; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java b/Core/src/main/java/com/plotsquared/plot/PlotCluster.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java rename to Core/src/main/java/com/plotsquared/plot/PlotCluster.java index 2bc591999..a393500ad 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotCluster.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotCluster.java @@ -1,8 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Location; +import com.plotsquared.database.DBFunc; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java b/Core/src/main/java/com/plotsquared/plot/PlotFilter.java similarity index 75% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java rename to Core/src/main/java/com/plotsquared/plot/PlotFilter.java index 09759c09d..546651104 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotFilter.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotFilter.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; public abstract class PlotFilter { public boolean allowsArea(final PlotArea area) { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java b/Core/src/main/java/com/plotsquared/plot/PlotHandler.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java rename to Core/src/main/java/com/plotsquared/plot/PlotHandler.java index 4faa17b76..579034c09 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotHandler.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotHandler.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; import java.util.Set; import java.util.UUID; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java b/Core/src/main/java/com/plotsquared/plot/PlotId.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java rename to Core/src/main/java/com/plotsquared/plot/PlotId.java index 3b0fa279c..633eb01b3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotId.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotId.java @@ -1,16 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; +import com.plotsquared.location.Direction; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class PlotId { - /** - * x value - */ + + @Deprecated public int x; - /** - * y value - */ + @Deprecated public int y; private int hash; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java b/Core/src/main/java/com/plotsquared/plot/PlotInventory.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java rename to Core/src/main/java/com/plotsquared/plot/PlotInventory.java index d2f3cd390..98cea2541 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotInventory.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotInventory.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.InventoryUtil; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.InventoryUtil; import lombok.NonNull; public class PlotInventory { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java b/Core/src/main/java/com/plotsquared/plot/PlotItemStack.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java rename to Core/src/main/java/com/plotsquared/plot/PlotItemStack.java index b142eda79..8136a1f2f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotItemStack.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotItemStack.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java b/Core/src/main/java/com/plotsquared/plot/PlotManager.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java rename to Core/src/main/java/com/plotsquared/plot/PlotManager.java index ff61e8006..fa07b81bb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotManager.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotManager.java @@ -1,8 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.commands.Template; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.util.FileBytes; +import com.plotsquared.location.Location; +import com.plotsquared.commands.Template; +import com.plotsquared.config.Settings; +import com.plotsquared.util.FileBytes; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java b/Core/src/main/java/com/plotsquared/plot/PlotSettings.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java rename to Core/src/main/java/com/plotsquared/plot/PlotSettings.java index 31bc58c1b..3eae77f8a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotSettings.java +++ b/Core/src/main/java/com/plotsquared/plot/PlotSettings.java @@ -1,6 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Direction; +import com.plotsquared.plot.comment.PlotComment; import com.google.common.collect.ImmutableList; import lombok.Getter; import lombok.Setter; diff --git a/Core/src/main/java/com/plotsquared/plot/PlotWeather.java b/Core/src/main/java/com/plotsquared/plot/PlotWeather.java new file mode 100644 index 000000000..eef830ac8 --- /dev/null +++ b/Core/src/main/java/com/plotsquared/plot/PlotWeather.java @@ -0,0 +1,5 @@ +package com.plotsquared.plot; + +public enum PlotWeather { + RAIN, CLEAR, RESET +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java b/Core/src/main/java/com/plotsquared/plot/Rating.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java rename to Core/src/main/java/com/plotsquared/plot/Rating.java index 911b2e6c5..1652eae98 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Rating.java +++ b/Core/src/main/java/com/plotsquared/plot/Rating.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.plotsquared.config.Settings; import java.util.ArrayList; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java b/Core/src/main/java/com/plotsquared/plot/SetupObject.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java rename to Core/src/main/java/com/plotsquared/plot/SetupObject.java index 167bb8e31..0b562525b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/SetupObject.java +++ b/Core/src/main/java/com/plotsquared/plot/SetupObject.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.util.SetupUtils; public class SetupObject { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java b/Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java rename to Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java index 5243dfb67..2b0a70901 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentInbox.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/CommentInbox.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.Permissions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.Permissions; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java b/Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java rename to Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java index fd2d2ebe6..93f559714 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/CommentManager.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/CommentManager.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.annotations.Beta; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java b/Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java rename to Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java index 375c3a9a6..60906e6ac 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxOwner.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/InboxOwner.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java b/Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java rename to Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java index 41e72bc66..96fa0523e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxPublic.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/InboxPublic.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java b/Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java rename to Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java index 8e73900b6..7ba8520ef 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/InboxReport.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/InboxReport.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.TaskManager; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java b/Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java rename to Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java index 7815d496e..0e52f0754 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/comment/PlotComment.java +++ b/Core/src/main/java/com/plotsquared/plot/comment/PlotComment.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.comment; +package com.plotsquared.plot.comment; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.PlotId; public class PlotComment { public final String comment; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java b/Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java rename to Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java index 5a2ec5e29..013e36e26 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpireManager.java +++ b/Core/src/main/java/com/plotsquared/plot/expiration/ExpireManager.java @@ -1,29 +1,29 @@ -package com.github.intellectualsites.plotsquared.plot.expiration; +package com.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotFlagAddEvent; -import com.github.intellectualsites.plotsquared.events.PlotUnlinkEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.flags.GlobalFlagContainer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.KeepFlag; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.events.Result; +import com.plotsquared.plot.flags.GlobalFlagContainer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.AnalysisFlag; +import com.plotsquared.plot.flags.implementations.KeepFlag; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import java.util.ArrayDeque; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java b/Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java rename to Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java index e65f5e33a..2fdb2a241 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/ExpiryTask.java +++ b/Core/src/main/java/com/plotsquared/plot/expiration/ExpiryTask.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.expiration; +package com.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotFilter; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotFilter; import java.util.ArrayList; import java.util.Collections; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java b/Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java rename to Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java index 969622bcd..9fdf61e8c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/expiration/PlotAnalysis.java +++ b/Core/src/main/java/com/plotsquared/plot/expiration/PlotAnalysis.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.plot.expiration; +package com.plotsquared.plot.expiration; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.AnalysisFlag; -import com.github.intellectualsites.plotsquared.generator.HybridUtils; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.implementations.AnalysisFlag; +import com.plotsquared.generator.HybridUtils; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.tasks.TaskManager; import java.lang.reflect.Array; import java.util.ArrayDeque; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagContainer.java b/Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagContainer.java rename to Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java index 98538b4be..aa2aa3640 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagContainer.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/FlagContainer.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.flags; +package com.plotsquared.plot.flags; import com.google.common.collect.ImmutableMap; import lombok.EqualsAndHashCode; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagParseException.java b/Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagParseException.java rename to Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java index 28b223a7f..d43fe39e1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/FlagParseException.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/FlagParseException.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags; +package com.plotsquared.plot.flags; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; +import com.plotsquared.config.Caption; +import com.plotsquared.config.CaptionUtility; public class FlagParseException extends Exception { diff --git a/Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java b/Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java new file mode 100644 index 000000000..e0be70863 --- /dev/null +++ b/Core/src/main/java/com/plotsquared/plot/flags/GlobalFlagContainer.java @@ -0,0 +1,222 @@ +package com.plotsquared.plot.flags; + +import com.plotsquared.plot.flags.implementations.AnalysisFlag; +import com.plotsquared.plot.flags.implementations.AnimalAttackFlag; +import com.plotsquared.plot.flags.implementations.AnimalCapFlag; +import com.plotsquared.plot.flags.implementations.AnimalInteractFlag; +import com.plotsquared.plot.flags.implementations.BlockBurnFlag; +import com.plotsquared.plot.flags.implementations.BlockIgnitionFlag; +import com.plotsquared.plot.flags.implementations.BlockedCmdsFlag; +import com.plotsquared.plot.flags.implementations.BreakFlag; +import com.plotsquared.plot.flags.implementations.CoralDryFlag; +import com.plotsquared.plot.flags.implementations.DenyExitFlag; +import com.plotsquared.plot.flags.implementations.DenyTeleportFlag; +import com.plotsquared.plot.flags.implementations.DescriptionFlag; +import com.plotsquared.plot.flags.implementations.DeviceInteractFlag; +import com.plotsquared.plot.flags.implementations.DisablePhysicsFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.flags.implementations.DropProtectionFlag; +import com.plotsquared.plot.flags.implementations.EntityCapFlag; +import com.plotsquared.plot.flags.implementations.ExplosionFlag; +import com.plotsquared.plot.flags.implementations.FarewellFlag; +import com.plotsquared.plot.flags.implementations.FeedFlag; +import com.plotsquared.plot.flags.implementations.FlyFlag; +import com.plotsquared.plot.flags.implementations.ForcefieldFlag; +import com.plotsquared.plot.flags.implementations.GamemodeFlag; +import com.plotsquared.plot.flags.implementations.GrassGrowFlag; +import com.plotsquared.plot.flags.implementations.GreetingFlag; +import com.plotsquared.plot.flags.implementations.GuestGamemodeFlag; +import com.plotsquared.plot.flags.implementations.HangingBreakFlag; +import com.plotsquared.plot.flags.implementations.HangingPlaceFlag; +import com.plotsquared.plot.flags.implementations.HealFlag; +import com.plotsquared.plot.flags.implementations.HideInfoFlag; +import com.plotsquared.plot.flags.implementations.HostileAttackFlag; +import com.plotsquared.plot.flags.implementations.HostileCapFlag; +import com.plotsquared.plot.flags.implementations.HostileInteractFlag; +import com.plotsquared.plot.flags.implementations.IceFormFlag; +import com.plotsquared.plot.flags.implementations.IceMeltFlag; +import com.plotsquared.plot.flags.implementations.InstabreakFlag; +import com.plotsquared.plot.flags.implementations.InvincibleFlag; +import com.plotsquared.plot.flags.implementations.ItemDropFlag; +import com.plotsquared.plot.flags.implementations.KeepFlag; +import com.plotsquared.plot.flags.implementations.KelpGrowFlag; +import com.plotsquared.plot.flags.implementations.LiquidFlowFlag; +import com.plotsquared.plot.flags.implementations.MiscBreakFlag; +import com.plotsquared.plot.flags.implementations.MiscCapFlag; +import com.plotsquared.plot.flags.implementations.MobBreakFlag; +import com.plotsquared.plot.flags.implementations.MobCapFlag; +import com.plotsquared.plot.flags.implementations.MobPlaceFlag; +import com.plotsquared.plot.flags.implementations.MusicFlag; +import com.plotsquared.plot.flags.implementations.MycelGrowFlag; +import com.plotsquared.plot.flags.implementations.NoWorldeditFlag; +import com.plotsquared.plot.flags.implementations.NotifyEnterFlag; +import com.plotsquared.plot.flags.implementations.NotifyLeaveFlag; +import com.plotsquared.plot.flags.implementations.PlaceFlag; +import com.plotsquared.plot.flags.implementations.PlayerInteractFlag; +import com.plotsquared.plot.flags.implementations.PriceFlag; +import com.plotsquared.plot.flags.implementations.PveFlag; +import com.plotsquared.plot.flags.implementations.PvpFlag; +import com.plotsquared.plot.flags.implementations.RedstoneFlag; +import com.plotsquared.plot.flags.implementations.ServerPlotFlag; +import com.plotsquared.plot.flags.implementations.SnowFormFlag; +import com.plotsquared.plot.flags.implementations.SnowMeltFlag; +import com.plotsquared.plot.flags.implementations.SoilDryFlag; +import com.plotsquared.plot.flags.implementations.TamedAttackFlag; +import com.plotsquared.plot.flags.implementations.TamedInteractFlag; +import com.plotsquared.plot.flags.implementations.TimeFlag; +import com.plotsquared.plot.flags.implementations.TitlesFlag; +import com.plotsquared.plot.flags.implementations.UntrustedVisitFlag; +import com.plotsquared.plot.flags.implementations.UseFlag; +import com.plotsquared.plot.flags.implementations.VehicleBreakFlag; +import com.plotsquared.plot.flags.implementations.VehicleCapFlag; +import com.plotsquared.plot.flags.implementations.VehiclePlaceFlag; +import com.plotsquared.plot.flags.implementations.VehicleUseFlag; +import com.plotsquared.plot.flags.implementations.VillagerInteractFlag; +import com.plotsquared.plot.flags.implementations.VineGrowFlag; +import com.plotsquared.plot.flags.implementations.WeatherFlag; +import lombok.Getter; + +import javax.annotation.Nonnull; +import java.util.Collections; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +public final class GlobalFlagContainer extends FlagContainer { + + @Getter private static final GlobalFlagContainer instance = new GlobalFlagContainer(); + private static Map> stringClassMap; + + private GlobalFlagContainer() { + super(null, (flag, type) -> { + if (type == PlotFlagUpdateType.FLAG_ADDED) { + stringClassMap.put(flag.getName().toLowerCase(Locale.ENGLISH), flag.getClass()); + } + }); + stringClassMap = new HashMap<>(); + // Register all default flags here + // Boolean flags + this.addFlag(ExplosionFlag.EXPLOSION_FALSE); + this.addFlag(UntrustedVisitFlag.UNTRUSTED_VISIT_FLAG_TRUE); + this.addFlag(DenyExitFlag.DENY_EXIT_FLAG_FALSE); + this.addFlag(DescriptionFlag.DESCRIPTION_FLAG_EMPTY); + this.addFlag(GreetingFlag.GREETING_FLAG_EMPTY); + this.addFlag(FarewellFlag.FAREWELL_FLAG_EMPTY); + this.addFlag(AnimalAttackFlag.ANIMAL_ATTACK_FALSE); + this.addFlag(AnimalInteractFlag.ANIMAL_INTERACT_FALSE); + this.addFlag(BlockBurnFlag.BLOCK_BURN_FALSE); + this.addFlag(BlockIgnitionFlag.BLOCK_IGNITION_TRUE); + this.addFlag(DeviceInteractFlag.DEVICE_INTERACT_FALSE); + this.addFlag(DisablePhysicsFlag.DISABLE_PHYSICS_FALSE); + this.addFlag(DropProtectionFlag.DROP_PROTECTION_FALSE); + this.addFlag(ForcefieldFlag.FORCEFIELD_FALSE); + this.addFlag(GrassGrowFlag.GRASS_GROW_TRUE); + this.addFlag(HangingBreakFlag.HANGING_BREAK_FALSE); + this.addFlag(HangingPlaceFlag.HANGING_PLACE_FALSE); + this.addFlag(HideInfoFlag.HIDE_INFO_FALSE); + this.addFlag(HostileAttackFlag.HOSTILE_ATTACK_FALSE); + this.addFlag(HostileInteractFlag.HOSTILE_INTERACT_FALSE); + this.addFlag(IceFormFlag.ICE_FORM_FALSE); + this.addFlag(IceMeltFlag.ICE_MELT_FALSE); + this.addFlag(KelpGrowFlag.KELP_GROW_TRUE); + this.addFlag(LiquidFlowFlag.LIQUID_FLOW_TRUE); + this.addFlag(RedstoneFlag.REDSTONE_TRUE); + this.addFlag(ServerPlotFlag.SERVER_PLOT_FALSE); + this.addFlag(MiscBreakFlag.MISC_BREAK_FALSE); + this.addFlag(MobBreakFlag.MOB_BREAK_FALSE); + this.addFlag(MobPlaceFlag.MOB_PLACE_FALSE); + this.addFlag(MycelGrowFlag.MYCEL_GROW_TRUE); + this.addFlag(NotifyEnterFlag.NOTIFY_ENTER_FALSE); + this.addFlag(NotifyLeaveFlag.NOTIFY_LEAVE_FALSE); + this.addFlag(NoWorldeditFlag.NO_WORLDEDIT_FALSE); + this.addFlag(PlayerInteractFlag.PLAYER_INTERACT_FALSE); + this.addFlag(PveFlag.PVE_FALSE); + this.addFlag(PvpFlag.PVP_FALSE); + this.addFlag(SnowFormFlag.SNOW_FORM_FALSE); + this.addFlag(SnowMeltFlag.SNOW_MELT_TRUE); + this.addFlag(SoilDryFlag.SOIL_DRY_FALSE); + this.addFlag(CoralDryFlag.CORAL_DRY_FALSE); + this.addFlag(TamedAttackFlag.TAMED_ATTACK_FALSE); + this.addFlag(TamedInteractFlag.TAMED_INTERACT_FALSE); + this.addFlag(VehicleBreakFlag.VEHICLE_BREAK_FALSE); + this.addFlag(VehiclePlaceFlag.VEHICLE_PLACE_FALSE); + this.addFlag(VehicleUseFlag.VEHICLE_USE_FALSE); + this.addFlag(VillagerInteractFlag.VILLAGER_INTERACT_FALSE); + this.addFlag(VineGrowFlag.VINE_GROW_TRUE); + this.addFlag(ItemDropFlag.ITEM_DROP_TRUE); + this.addFlag(InstabreakFlag.INSTABREAK_FALSE); + this.addFlag(InvincibleFlag.INVINCIBLE_FALSE); + + // Enum Flags + this.addFlag(WeatherFlag.PLOT_WEATHER_FLAG_OFF); + this.addFlag(DenyTeleportFlag.DENY_TELEPORT_FLAG_NONE); + this.addFlag(TitlesFlag.TITLES_NONE); + this.addFlag(FlyFlag.FLIGHT_FLAG_DEFAULT); + + // Integer flags + this.addFlag(AnimalCapFlag.ANIMAL_CAP_UNLIMITED); + this.addFlag(EntityCapFlag.ENTITY_CAP_UNLIMITED); + this.addFlag(HostileCapFlag.HOSTILE_CAP_UNLIMITED); + this.addFlag(MiscCapFlag.MISC_CAP_UNLIMITED); + this.addFlag(MobCapFlag.MOB_CAP_UNLIMITED); + this.addFlag(TimeFlag.TIME_DISABLED); + this.addFlag(VehicleCapFlag.VEHICLE_CAP_UNLIMITED); + + // Timed flags + this.addFlag(FeedFlag.FEED_NOTHING); + this.addFlag(HealFlag.HEAL_NOTHING); + + // Double flags + this.addFlag(PriceFlag.PRICE_NOT_BUYABLE); + + // Block type list flags + this.addFlag(BreakFlag.BREAK_NONE); + this.addFlag(PlaceFlag.PLACE_NONE); + this.addFlag(UseFlag.USE_NONE); + + // Misc + this.addFlag(GamemodeFlag.GAMEMODE_FLAG_DEFAULT); + this.addFlag(GuestGamemodeFlag.GUEST_GAMEMODE_FLAG_DEFAULT); + this.addFlag(BlockedCmdsFlag.BLOCKED_CMDS_FLAG_NONE); + this.addFlag(KeepFlag.KEEP_FLAG_FALSE); + this.addFlag(MusicFlag.MUSIC_FLAG_NONE); + + // Internal flags + this.addFlag(new AnalysisFlag(Collections.emptyList())); + this.addFlag(new DoneFlag("")); + } + + @Override public PlotFlag getFlagErased(Class flagClass) { + final PlotFlag flag = super.getFlagErased(flagClass); + if (flag != null) { + return flag; + } else { + throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types" + + " must be present in the global flag container.", flagClass.getSimpleName())); + } + } + + @Nonnull @Override + public > T getFlag(Class flagClass) { + final PlotFlag flag = super.getFlag(flagClass); + if (flag != null) { + return castUnsafe(flag); + } else { + throw new IllegalStateException(String.format("Unrecognized flag '%s'. All flag types" + + " must be present in the global flag container.", flagClass.getSimpleName())); + } + } + + public Class getFlagClassFromString(final String name) { + return stringClassMap.get(name.toLowerCase(Locale.ENGLISH)); + } + + public PlotFlag getFlagFromString(final String name) { + final Class flagClass = this.getFlagClassFromString(name); + if (flagClass == null) { + return null; + } + return getFlagErased(flagClass); + } + +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/InternalFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/InternalFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java index 0ca6e519a..77940b8c9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/InternalFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/InternalFlag.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.flags; +package com.plotsquared.plot.flags; /** * These are flags used in PlotSquared and PlotSquared diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/PlotFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/PlotFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java index ab8052334..1f800f5e3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/PlotFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/PlotFlag.java @@ -1,7 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags; +package com.plotsquared.plot.flags; -import com.github.intellectualsites.plotsquared.plot.config.Caption; +import com.plotsquared.config.Caption; import com.google.common.base.Preconditions; +import com.plotsquared.config.Captions; import lombok.EqualsAndHashCode; import org.jetbrains.annotations.NotNull; @@ -110,7 +111,7 @@ public abstract class PlotFlag> { /** * Get the category this flag belongs to. Usually a caption from - * {@link com.github.intellectualsites.plotsquared.plot.config.Captions} + * {@link Captions} *

* These categories are used to categorize the flags when outputting * flag lists to players. diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnalysisFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnalysisFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java index 38485f3f1..6f7b367f2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnalysisFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnalysisFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.ListFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.InternalFlag; +import com.plotsquared.plot.flags.types.ListFlag; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalAttackFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalAttackFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java index 24d558e33..808bccf47 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalAttackFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class AnimalAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java index 10d4a8397..95fb67924 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class AnimalCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java index c71bd6fa2..129501c85 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/AnimalInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/AnimalInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class AnimalInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockBurnFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockBurnFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java index 176b12232..ef18a552b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockBurnFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockBurnFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class BlockBurnFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java index 03ffd8d75..d0d127aae 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockIgnitionFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class BlockIgnitionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java similarity index 74% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java index df8a856d0..f2cbcffd2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BlockedCmdsFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.types.ListFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.types.ListFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java similarity index 61% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java index 511577375..4f5cec1fa 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/BreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/BreakFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BlockTypeListFlag; +import com.plotsquared.plot.flags.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/CoralDryFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/CoralDryFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java index a17a2db35..411fa6bc4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/CoralDryFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/CoralDryFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class CoralDryFlag extends BooleanFlag { @@ -17,4 +17,4 @@ public class CoralDryFlag extends BooleanFlag { return value ? CORAL_DRY_TRUE : CORAL_DRY_FALSE; } -} \ No newline at end of file +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyExitFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyExitFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java index 97accde0a..4bd0223dc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyExitFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyExitFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DenyExitFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java index 96b91a2c8..02367ccb8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DenyTeleportFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DenyTeleportFlag.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DescriptionFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DescriptionFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java index eddd908df..48e52a5a1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DescriptionFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DescriptionFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; public class DescriptionFlag extends PlotFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DeviceInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DeviceInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java index cbe8197dc..5c44fbea8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DeviceInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DeviceInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DeviceInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java index 2dbd0e966..c860fd65b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DisablePhysicsFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DisablePhysicsFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DoneFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DoneFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java index d012419e6..d6f485637 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DoneFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DoneFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.InternalFlag; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.InternalFlag; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; import org.jetbrains.annotations.NotNull; public class DoneFlag extends PlotFlag implements InternalFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DropProtectionFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DropProtectionFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java index 31df4cdf3..97ba891a2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/DropProtectionFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/DropProtectionFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class DropProtectionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/EntityCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/EntityCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java index 65976f04a..9349f6f11 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/EntityCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/EntityCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class EntityCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ExplosionFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ExplosionFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java index c9dfe320a..96716d6b6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ExplosionFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ExplosionFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ExplosionFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FarewellFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FarewellFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java index b2ddebef3..bccd4d576 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FarewellFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FarewellFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; public class FarewellFlag extends PlotFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FeedFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FeedFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java index 00fb6e7a9..413918d84 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FeedFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FeedFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.types.TimedFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.types.TimedFlag; import org.jetbrains.annotations.NotNull; public class FeedFlag extends TimedFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FlyFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FlyFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java index 85bbb5335..7f31f3dbe 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/FlyFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/FlyFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ForcefieldFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ForcefieldFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java index 57725f12b..a640258c8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ForcefieldFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ForcefieldFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ForcefieldFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GamemodeFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GamemodeFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java index ceef0f83c..d800b1a0b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GamemodeFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GrassGrowFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GrassGrowFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java index c41ac22b5..acaf7216c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GrassGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GrassGrowFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class GrassGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GreetingFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GreetingFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java index 736ce6d2a..1fe18f0cf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GreetingFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GreetingFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; public class GreetingFlag extends PlotFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java index 7994a3307..7cdc0dbd6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/GuestGamemodeFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import com.sk89q.worldedit.world.gamemode.GameMode; import com.sk89q.worldedit.world.gamemode.GameModes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingBreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingBreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java index 7dc09061f..cfc34c627 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingBreakFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HangingBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingPlaceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingPlaceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java index 5161636a2..0d134619e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HangingPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HangingPlaceFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HangingPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HealFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HealFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java index 6a89bde11..468d340d5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HealFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HealFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.types.TimedFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.types.TimedFlag; import org.jetbrains.annotations.NotNull; public class HealFlag extends TimedFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HideInfoFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HideInfoFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java index 47a8c65f2..2bb53925b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HideInfoFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HideInfoFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HideInfoFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileAttackFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileAttackFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java index 4df0f6147..ac7ebad04 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileAttackFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HostileAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java index 4da181745..bc3c364cf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class HostileCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java index 9a0b02c01..3e6538cbb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/HostileInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/HostileInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class HostileInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceFormFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java similarity index 68% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceFormFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java index f33c44548..fa605d594 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceFormFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceFormFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class IceFormFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceMeltFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java similarity index 68% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceMeltFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java index 735457e54..7e15b2679 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/IceMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/IceMeltFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class IceMeltFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InstabreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InstabreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java index ae8c1d209..d0ec50f6a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InstabreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/InstabreakFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class InstabreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InvincibleFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InvincibleFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java index 978bc98ab..093df7da4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/InvincibleFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/InvincibleFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class InvincibleFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ItemDropFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ItemDropFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java index ea6031cf6..87f217c8a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ItemDropFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ItemDropFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ItemDropFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java index c8f8d2fa9..f818a3f3b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KeepFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/KeepFlag.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; import org.jetbrains.annotations.NotNull; public class KeepFlag extends PlotFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KelpGrowFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KelpGrowFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java index 443d9c919..0e1c48af7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/KelpGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/KelpGrowFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class KelpGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/LiquidFlowFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/LiquidFlowFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java index 739c81408..86243b0cc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/LiquidFlowFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/LiquidFlowFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class LiquidFlowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscBreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscBreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java index 2c8313a61..2403f9537 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscBreakFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java similarity index 64% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java index a38821969..21a392d15 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class MiscCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java index 9f1a951e9..694336170 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscPlaceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscPlaceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java index acb34bc21..e8983926f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MiscPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MiscPlaceFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MiscPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobBreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobBreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java index 426c338cc..fe8c5b797 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobBreakFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MobBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java similarity index 64% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java index 02e84c439..92cb3b5c1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class MobCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobPlaceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobPlaceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java index 72341d1dc..05469a15f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MobPlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MobPlaceFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MobPlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java index d5fc94dd3..332c10511 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MusicFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MusicFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.util.ItemUtil; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.util.ItemUtil; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MycelGrowFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MycelGrowFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MycelGrowFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/MycelGrowFlag.java index ee746a8c9..5b627fdee 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/MycelGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/MycelGrowFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class MycelGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NoWorldeditFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NoWorldeditFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java index 32b0eab1f..0528b6270 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NoWorldeditFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NoWorldeditFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NoWorldeditFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyEnterFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyEnterFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java index bcfce98cf..1153c0b32 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyEnterFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyEnterFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NotifyEnterFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java index f1c64613b..74c0e33c4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/NotifyLeaveFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class NotifyLeaveFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlaceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java similarity index 61% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlaceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java index f037b669f..6ed11f5ed 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlaceFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BlockTypeListFlag; +import com.plotsquared.plot.flags.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlayerInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java similarity index 72% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlayerInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java index 02bfc3ad4..462697fe9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PlayerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PlayerInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PlayerInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PriceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java similarity index 65% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PriceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java index fd77fd3eb..3903e22fc 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PriceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PriceFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.DoubleFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.DoubleFlag; import org.jetbrains.annotations.NotNull; public class PriceFlag extends DoubleFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PveFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PveFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java index 99eaf3935..40b0b7f81 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PveFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PveFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PveFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PvpFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PvpFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java index 18a13099f..121a7a919 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/PvpFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/PvpFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class PvpFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/RedstoneFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/RedstoneFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java index 12ff72a5e..1464b3d65 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/RedstoneFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/RedstoneFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class RedstoneFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ServerPlotFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ServerPlotFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java index 80ab483d8..f9f5721d6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/ServerPlotFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/ServerPlotFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class ServerPlotFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowFormFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowFormFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java index f5eb679f1..b2fe7476c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowFormFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowFormFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SnowFormFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowMeltFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowMeltFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java index f0f73f0f3..64f21226c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SnowMeltFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SnowMeltFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SnowMeltFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SoilDryFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java similarity index 68% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SoilDryFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java index 5c77e688b..ccb6427c8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/SoilDryFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/SoilDryFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class SoilDryFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedAttackFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedAttackFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java index 6eb111eb3..8c223e9bf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedAttackFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedAttackFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class TamedAttackFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java index 449f702b0..c00d59938 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TamedInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TamedInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class TamedInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TimeFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java similarity index 63% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TimeFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java index bf6d1068d..2c9622d38 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TimeFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TimeFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.LongFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.LongFlag; import org.jetbrains.annotations.NotNull; public class TimeFlag extends LongFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TitlesFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TitlesFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java index 7473596d9..9de603782 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/TitlesFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/TitlesFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java similarity index 67% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java index 279144f5c..722e9ef66 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/UntrustedVisitFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class UntrustedVisitFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UseFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java similarity index 61% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UseFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java index 89b5792b1..06151d8a6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/UseFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/UseFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeListFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BlockTypeListFlag; +import com.plotsquared.plot.flags.types.BlockTypeWrapper; import org.jetbrains.annotations.NotNull; import java.util.Collections; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleBreakFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleBreakFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java index 689effbb6..c31ac563b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleBreakFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleBreakFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehicleBreakFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleCapFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java similarity index 66% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleCapFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java index baef7c2fb..ed3d74211 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleCapFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleCapFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.NonNegativeIntegerFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.NonNegativeIntegerFlag; import org.jetbrains.annotations.NotNull; public class VehicleCapFlag extends NonNegativeIntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java index fb6fbf4d2..f0b010258 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehiclePlaceFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehiclePlaceFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleUseFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleUseFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java index 74a6961e5..6915d1c3c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VehicleUseFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VehicleUseFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VehicleUseFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VillagerInteractFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VillagerInteractFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java index eebae0799..1607c90a7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VillagerInteractFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VillagerInteractFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VillagerInteractFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VineGrowFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java similarity index 69% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VineGrowFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java index 8409edd7d..c445583bb 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/VineGrowFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/VineGrowFlag.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.types.BooleanFlag; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.types.BooleanFlag; import org.jetbrains.annotations.NotNull; public class VineGrowFlag extends BooleanFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java index 94522e4e7..ef404fa62 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/implementations/WeatherFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/implementations/WeatherFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.implementations; +package com.plotsquared.plot.flags.implementations; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.PlotWeather; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.PlotWeather; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java index 2b943d206..41da887b8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeListFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeListFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.util.BlockUtil; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.util.BlockUtil; import com.sk89q.worldedit.world.block.BlockCategory; import com.sk89q.worldedit.world.block.BlockState; import com.sk89q.worldedit.world.block.BlockType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeWrapper.java b/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeWrapper.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeWrapper.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeWrapper.java index 03ea40ef5..85bc0addf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BlockTypeWrapper.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/BlockTypeWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; import com.google.common.base.Preconditions; import com.sk89q.worldedit.world.block.BlockCategory; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BooleanFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BooleanFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java index 79b5c66bd..f722783dd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/BooleanFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/BooleanFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; import java.util.Arrays; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/DoubleFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/DoubleFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java index 06a97337c..d00c12a91 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/DoubleFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/DoubleFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class DoubleFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/IntegerFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/IntegerFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java index c74fe51c1..b8b23d6e9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/IntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/IntegerFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class IntegerFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java similarity index 68% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java index 0c2f66068..65fc07d06 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/ListFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/ListFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.util.StringMan; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/LongFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/LongFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java index f7fb37b9f..3af953fb4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/LongFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/LongFlag.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; import org.jetbrains.annotations.NotNull; public abstract class LongFlag> extends NumberFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java similarity index 76% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java index 87c9bebfb..efff986d8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/NonNegativeIntegerFlag.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; +import com.plotsquared.config.Caption; import org.jetbrains.annotations.NotNull; public abstract class NonNegativeIntegerFlag> extends IntegerFlag { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NumberFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NumberFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java index 23e2d00c1..935caa9c5 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/NumberFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/NumberFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; public abstract class NumberFlag, F extends PlotFlag> diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/TimedFlag.java b/Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/TimedFlag.java rename to Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java index a31ee6330..16271d239 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flags/types/TimedFlag.java +++ b/Core/src/main/java/com/plotsquared/plot/flags/types/TimedFlag.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.flags.types; +package com.plotsquared.plot.flags.types; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.flags.FlagParseException; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.config.Caption; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.flags.FlagParseException; +import com.plotsquared.plot.flags.PlotFlag; import org.jetbrains.annotations.NotNull; public abstract class TimedFlag, F>> diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java b/Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java rename to Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java index 4678c8be5..72c312389 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlainChatManager.java +++ b/Core/src/main/java/com/plotsquared/plot/message/PlainChatManager.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.object.message; +package com.plotsquared.plot.message; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.ChatManager; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java b/Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java rename to Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java index 36b6a4bd3..8fe23da43 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/message/PlotMessage.java +++ b/Core/src/main/java/com/plotsquared/plot/message/PlotMessage.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.message; +package com.plotsquared.plot.message; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.util.ChatManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.Captions; +import com.plotsquared.util.ChatManager; public class PlotMessage { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java b/Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java rename to Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java index 16397d0da..abec4647d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/PlotItem.java +++ b/Core/src/main/java/com/plotsquared/plot/schematic/PlotItem.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.schematic; +package com.plotsquared.plot.schematic; import com.sk89q.worldedit.world.item.ItemType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java b/Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java rename to Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java index cdd1f25f1..a47ad95a2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/Schematic.java +++ b/Core/src/main/java/com/plotsquared/plot/schematic/Schematic.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.schematic; +package com.plotsquared.plot.schematic; import com.sk89q.jnbt.NBTOutputStream; import com.sk89q.jnbt.Tag; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java b/Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java rename to Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java index a19404da2..1df345797 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/schematic/StoredEntity.java +++ b/Core/src/main/java/com/plotsquared/plot/schematic/StoredEntity.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object.schematic; +package com.plotsquared.plot.schematic; import com.sk89q.worldedit.entity.BaseEntity; import com.sk89q.worldedit.entity.Entity; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java b/Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java rename to Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java index 2030a6c07..6f916550d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/DefaultPlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/DefaultPlotAreaManager.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.area.QuadMap; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.area.QuadMap; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java b/Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java rename to Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java index 03e881822..687677ca4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/PlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/PlotAreaManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java similarity index 79% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java rename to Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java index ef29f37c2..0ed1f66f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlot.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlot.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.BlockLoc; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.location.BlockLoc; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java rename to Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java index 5f9325761..56138c325 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotArea.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotArea.java @@ -1,23 +1,23 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Configuration; -import com.github.intellectualsites.plotsquared.plot.config.ConfigurationNode; -import com.github.intellectualsites.plotsquared.plot.flags.FlagContainer; -import com.github.intellectualsites.plotsquared.generator.GridPlotWorld; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotLoc; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.plot.object.PlotSettings; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Configuration; +import com.plotsquared.config.ConfigurationNode; +import com.plotsquared.plot.flags.FlagContainer; +import com.plotsquared.generator.GridPlotWorld; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; +import com.plotsquared.location.PlotLoc; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.plot.PlotSettings; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.SetupObject; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.WorldUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java rename to Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java index 6ef9356a4..d62d6fc41 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotAreaManager.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotAreaManager.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.collection.ArrayUtil; -import com.github.intellectualsites.plotsquared.util.SetupUtils; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.collection.ArrayUtil; +import com.plotsquared.util.SetupUtils; import com.sk89q.worldedit.regions.CuboidRegion; import org.jetbrains.annotations.NotNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java rename to Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java index 85eff470e..74536da66 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SinglePlotManager.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/SinglePlotManager.java @@ -1,14 +1,14 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.SetupUtils; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.SetupUtils; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.function.pattern.Pattern; import java.io.File; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java b/Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java similarity index 75% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java rename to Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java index fb7580a8b..57838d14a 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/worlds/SingleWorldGenerator.java +++ b/Core/src/main/java/com/plotsquared/plot/worlds/SingleWorldGenerator.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.plot.object.worlds; +package com.plotsquared.plot.worlds; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.generator.IndependentPlotGenerator; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.PlotSquared; +import com.plotsquared.generator.IndependentPlotGenerator; +import com.plotsquared.location.Location; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.queue.ScopedLocalBlockQueue; import com.sk89q.worldedit.world.biome.BiomeTypes; import com.sk89q.worldedit.world.block.BlockTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java index c3f7fc7f0..2d23afa6d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/BasicLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/BasicLocalBlockQueue.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.MathMan; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.PatternUtil; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.MathMan; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.PatternUtil; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/ChunkBlockQueue.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/ChunkBlockQueue.java index d556c0186..4438d2b6c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ChunkBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/ChunkBlockQueue.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; -import com.github.intellectualsites.plotsquared.plot.object.Location; +import com.plotsquared.location.Location; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java index 45d1e7c7c..8bef4eb2f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/DelegateLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/DelegateLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java similarity index 97% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java index 41806696b..c649f0ca4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/GlobalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/GlobalBlockQueue.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal2; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.util.tasks.RunnableVal2; +import com.plotsquared.util.tasks.TaskManager; import java.util.ArrayList; import java.util.ConcurrentModificationException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java index 468fda102..981a85cd4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/LocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/LocalBlockQueue.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.SchematicHandler; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.WorldUtil; -import com.github.intellectualsites.plotsquared.util.PatternUtil; +import com.plotsquared.location.Location; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.SchematicHandler; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.WorldUtil; +import com.plotsquared.util.PatternUtil; import com.sk89q.jnbt.CompoundTag; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.math.BlockVector2; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/OffsetLocalBlockQueue.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/OffsetLocalBlockQueue.java index 9e8341fbd..ffd28c381 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/OffsetLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/OffsetLocalBlockQueue.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java b/Core/src/main/java/com/plotsquared/queue/QueueProvider.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java rename to Core/src/main/java/com/plotsquared/queue/QueueProvider.java index 732e8258a..dc770fde9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/QueueProvider.java +++ b/Core/src/main/java/com/plotsquared/queue/QueueProvider.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; public abstract class QueueProvider { public static QueueProvider of(final Class primary, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java b/Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java similarity index 87% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java rename to Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java index a21855a29..1ef352aa7 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/queue/ScopedLocalBlockQueue.java +++ b/Core/src/main/java/com/plotsquared/queue/ScopedLocalBlockQueue.java @@ -1,11 +1,11 @@ -package com.github.intellectualsites.plotsquared.queue; +package com.plotsquared.queue; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotManager; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal3; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotManager; +import com.plotsquared.util.tasks.RunnableVal3; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.biome.BiomeType; import com.sk89q.worldedit.world.block.BaseBlock; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java b/Core/src/main/java/com/plotsquared/util/BlockUtil.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java rename to Core/src/main/java/com/plotsquared/util/BlockUtil.java index acbe241f6..bba0579b2 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/BlockUtil.java +++ b/Core/src/main/java/com/plotsquared/util/BlockUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.extension.input.InputParseException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java b/Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java similarity index 81% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java rename to Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java index 27d2f9e21..758f76a6e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ByteArrayUtilities.java +++ b/Core/src/main/java/com/plotsquared/util/ByteArrayUtilities.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; public class ByteArrayUtilities { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java b/Core/src/main/java/com/plotsquared/util/ChatManager.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java rename to Core/src/main/java/com/plotsquared/util/ChatManager.java index d8ce03410..d48c021be 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChatManager.java +++ b/Core/src/main/java/com/plotsquared/util/ChatManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.message.PlotMessage; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.message.PlotMessage; +import com.plotsquared.player.PlotPlayer; public abstract class ChatManager { public static ChatManager manager; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java b/Core/src/main/java/com/plotsquared/util/ChunkManager.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java rename to Core/src/main/java/com/plotsquared/util/ChunkManager.java index ed4de3a75..ef2df9de0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ChunkManager.java +++ b/Core/src/main/java/com/plotsquared/util/ChunkManager.java @@ -1,13 +1,13 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.queue.GlobalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.queue.ScopedLocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.queue.GlobalBlockQueue; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.queue.ScopedLocalBlockQueue; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java b/Core/src/main/java/com/plotsquared/util/ConsoleColors.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java rename to Core/src/main/java/com/plotsquared/util/ConsoleColors.java index 1bd893bb4..3823c0637 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ConsoleColors.java +++ b/Core/src/main/java/com/plotsquared/util/ConsoleColors.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; public class ConsoleColors { public static String fromString(String input) { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java b/Core/src/main/java/com/plotsquared/util/EconHandler.java similarity index 75% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java rename to Core/src/main/java/com/plotsquared/util/EconHandler.java index b1c383efc..08644241b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EconHandler.java +++ b/Core/src/main/java/com/plotsquared/util/EconHandler.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; public abstract class EconHandler { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java b/Core/src/main/java/com/plotsquared/util/EntityUtil.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java rename to Core/src/main/java/com/plotsquared/util/EntityUtil.java index 17bc405f7..0e49acb91 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EntityUtil.java +++ b/Core/src/main/java/com/plotsquared/util/EntityUtil.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DoneFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DoneFlag; +import com.plotsquared.plot.Plot; import lombok.NonNull; import lombok.experimental.UtilityClass; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java b/Core/src/main/java/com/plotsquared/util/EventDispatcher.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java rename to Core/src/main/java/com/plotsquared/util/EventDispatcher.java index daeff7ccb..3e6cd127f 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/EventDispatcher.java +++ b/Core/src/main/java/com/plotsquared/util/EventDispatcher.java @@ -1,19 +1,48 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.events.*; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.*; -import com.github.intellectualsites.plotsquared.plot.flags.types.BlockTypeWrapper; -import com.github.intellectualsites.plotsquared.listener.PlayerBlockEventType; -import com.github.intellectualsites.plotsquared.plot.object.*; -import com.github.intellectualsites.plotsquared.plot.object.worlds.SinglePlotArea; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.events.PlayerAutoPlotEvent; +import com.plotsquared.events.PlayerClaimPlotEvent; +import com.plotsquared.events.PlayerEnterPlotEvent; +import com.plotsquared.events.PlayerLeavePlotEvent; +import com.plotsquared.events.PlayerPlotDeniedEvent; +import com.plotsquared.events.PlayerPlotHelperEvent; +import com.plotsquared.events.PlayerPlotTrustedEvent; +import com.plotsquared.events.PlayerTeleportToPlotEvent; +import com.plotsquared.events.PlotAutoMergeEvent; +import com.plotsquared.events.PlotChangeOwnerEvent; +import com.plotsquared.events.PlotClearEvent; +import com.plotsquared.events.PlotComponentSetEvent; +import com.plotsquared.events.PlotDeleteEvent; +import com.plotsquared.events.PlotDoneEvent; +import com.plotsquared.events.PlotEvent; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.PlotRateEvent; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DeviceInteractFlag; +import com.plotsquared.plot.flags.implementations.MiscPlaceFlag; +import com.plotsquared.plot.flags.implementations.MobPlaceFlag; +import com.plotsquared.plot.flags.implementations.PlaceFlag; +import com.plotsquared.plot.flags.implementations.UseFlag; +import com.plotsquared.plot.flags.implementations.VehiclePlaceFlag; +import com.plotsquared.plot.flags.types.BlockTypeWrapper; +import com.plotsquared.listener.PlayerBlockEventType; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.Rating; +import com.plotsquared.plot.worlds.SinglePlotArea; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.eventbus.EventBus; import com.sk89q.worldedit.function.pattern.Pattern; import com.sk89q.worldedit.world.block.BlockType; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java b/Core/src/main/java/com/plotsquared/util/Expression.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java rename to Core/src/main/java/com/plotsquared/util/Expression.java index efd7771f8..35b4fab7b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Expression.java +++ b/Core/src/main/java/com/plotsquared/util/Expression.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.DebugExec; -import com.github.intellectualsites.plotsquared.commands.MainCommand; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.DebugExec; +import com.plotsquared.commands.MainCommand; import javax.script.ScriptException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java b/Core/src/main/java/com/plotsquared/util/FileBytes.java similarity index 78% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java rename to Core/src/main/java/com/plotsquared/util/FileBytes.java index e32f6ead2..0e3750053 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/FileBytes.java +++ b/Core/src/main/java/com/plotsquared/util/FileBytes.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; public class FileBytes { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java b/Core/src/main/java/com/plotsquared/util/InventoryUtil.java similarity index 71% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java rename to Core/src/main/java/com/plotsquared/util/InventoryUtil.java index 1b30ef1b2..d9650c995 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/InventoryUtil.java +++ b/Core/src/main/java/com/plotsquared/util/InventoryUtil.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.PlotInventory; -import com.github.intellectualsites.plotsquared.plot.object.PlotItemStack; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.PlotInventory; +import com.plotsquared.plot.PlotItemStack; +import com.plotsquared.player.PlotPlayer; /** * This class is only used by internal functions, for most cases use the PlotInventory class diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java b/Core/src/main/java/com/plotsquared/util/ItemUtil.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java rename to Core/src/main/java/com/plotsquared/util/ItemUtil.java index 9d562a924..7665a49fa 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ItemUtil.java +++ b/Core/src/main/java/com/plotsquared/util/ItemUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; import com.sk89q.worldedit.world.item.ItemType; import com.sk89q.worldedit.world.item.ItemTypes; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java b/Core/src/main/java/com/plotsquared/util/LazyBlock.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java rename to Core/src/main/java/com/plotsquared/util/LazyBlock.java index 9f3345a83..90b1bd13c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyBlock.java +++ b/Core/src/main/java/com/plotsquared/util/LazyBlock.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.util; import com.sk89q.worldedit.world.block.BlockState; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java b/Core/src/main/java/com/plotsquared/util/LazyResult.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java rename to Core/src/main/java/com/plotsquared/util/LazyResult.java index 8487c44be..5f156be5c 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/LazyResult.java +++ b/Core/src/main/java/com/plotsquared/util/LazyResult.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.util; public abstract class LazyResult { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java b/Core/src/main/java/com/plotsquared/util/LegacyConverter.java similarity index 90% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java rename to Core/src/main/java/com/plotsquared/util/LegacyConverter.java index 22e0845e3..2b65da11d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/LegacyConverter.java +++ b/Core/src/main/java/com/plotsquared/util/LegacyConverter.java @@ -1,12 +1,11 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.object.BlockBucket; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.util.WorldUtil; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.plot.BlockBucket; +import com.plotsquared.player.ConsolePlayer; import com.sk89q.worldedit.world.block.BlockState; import lombok.NonNull; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java b/Core/src/main/java/com/plotsquared/util/MainUtil.java similarity index 94% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java rename to Core/src/main/java/com/plotsquared/util/MainUtil.java index 36d10ae1d..a4efd6760 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MainUtil.java +++ b/Core/src/main/java/com/plotsquared/util/MainUtil.java @@ -1,30 +1,31 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.configuration.ConfigurationSection; -import com.github.intellectualsites.plotsquared.player.ConsolePlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.commands.Like; -import com.github.intellectualsites.plotsquared.plot.config.Caption; -import com.github.intellectualsites.plotsquared.plot.config.CaptionUtility; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.plot.expiration.ExpireManager; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.DescriptionFlag; -import com.github.intellectualsites.plotsquared.plot.flags.implementations.ServerPlotFlag; -import com.github.intellectualsites.plotsquared.plot.flags.types.DoubleFlag; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaTerrainType; -import com.github.intellectualsites.plotsquared.plot.object.PlotAreaType; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.plot.object.stream.AbstractDelegateOutputStream; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.PlotSquared; +import com.plotsquared.collection.AbstractDelegateOutputStream; +import com.plotsquared.configuration.ConfigurationSection; +import com.plotsquared.player.ConsolePlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.Like; +import com.plotsquared.config.Caption; +import com.plotsquared.config.CaptionUtility; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.plot.expiration.ExpireManager; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.flags.implementations.DescriptionFlag; +import com.plotsquared.plot.flags.implementations.ServerPlotFlag; +import com.plotsquared.plot.flags.types.DoubleFlag; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotAreaTerrainType; +import com.plotsquared.plot.PlotAreaType; +import com.plotsquared.plot.PlotId; + +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.TaskManager; +import com.plotsquared.util.uuid.UUIDHandler; import com.sk89q.worldedit.math.BlockVector2; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; @@ -635,7 +636,8 @@ public class MainUtil { public static boolean sendMessage(PlotPlayer player, @NotNull String msg, boolean prefix) { if (!msg.isEmpty()) { if (player == null) { - String message = CaptionUtility.format(null, (prefix ? Captions.PREFIX.getTranslated() : "") + msg); + String message = CaptionUtility + .format(null, (prefix ? Captions.PREFIX.getTranslated() : "") + msg); PlotSquared.log(message); } else { player.sendMessage( diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java b/Core/src/main/java/com/plotsquared/util/MathMan.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java rename to Core/src/main/java/com/plotsquared/util/MathMan.java index b2cb2b428..7730a590b 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/MathMan.java +++ b/Core/src/main/java/com/plotsquared/util/MathMan.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; public class MathMan { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java b/Core/src/main/java/com/plotsquared/util/OperationUtil.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java rename to Core/src/main/java/com/plotsquared/util/OperationUtil.java index 60107930b..546f56937 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/OperationUtil.java +++ b/Core/src/main/java/com/plotsquared/util/OperationUtil.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.location.Location; +import com.plotsquared.player.PlotPlayer; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListeningExecutorService; import com.sk89q.worldedit.EditSession; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java b/Core/src/main/java/com/plotsquared/util/PatternUtil.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java rename to Core/src/main/java/com/plotsquared/util/PatternUtil.java index 5944f295b..8985865be 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PatternUtil.java +++ b/Core/src/main/java/com/plotsquared/util/PatternUtil.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.Command; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; import com.google.common.base.Preconditions; import com.sk89q.worldedit.WorldEdit; import com.sk89q.worldedit.entity.Player; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java b/Core/src/main/java/com/plotsquared/util/Permissions.java similarity index 91% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java rename to Core/src/main/java/com/plotsquared/util/Permissions.java index 10d08569e..e1da1bcdd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/Permissions.java +++ b/Core/src/main/java/com/plotsquared/util/Permissions.java @@ -1,10 +1,9 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.commands.CommandCaller; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; +import com.plotsquared.commands.CommandCaller; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.player.PlotPlayer; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java b/Core/src/main/java/com/plotsquared/util/PremiumVerification.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java rename to Core/src/main/java/com/plotsquared/util/PremiumVerification.java index c29643a5d..4081a5e45 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/PremiumVerification.java +++ b/Core/src/main/java/com/plotsquared/util/PremiumVerification.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; public class PremiumVerification { private static Boolean usingPremium; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java b/Core/src/main/java/com/plotsquared/util/PseudoRandom.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java rename to Core/src/main/java/com/plotsquared/util/PseudoRandom.java index 490f8c926..84419aa34 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PseudoRandom.java +++ b/Core/src/main/java/com/plotsquared/util/PseudoRandom.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.util; public class PseudoRandom { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java b/Core/src/main/java/com/plotsquared/util/ReflectionUtils.java similarity index 99% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java rename to Core/src/main/java/com/plotsquared/util/ReflectionUtils.java index 751815344..3c2ffb2f9 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/ReflectionUtils.java +++ b/Core/src/main/java/com/plotsquared/util/ReflectionUtils.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java b/Core/src/main/java/com/plotsquared/util/RegExUtil.java similarity index 80% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java rename to Core/src/main/java/com/plotsquared/util/RegExUtil.java index c59fdcdd7..9947097c0 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegExUtil.java +++ b/Core/src/main/java/com/plotsquared/util/RegExUtil.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; import java.util.HashMap; import java.util.Map; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java b/Core/src/main/java/com/plotsquared/util/RegionUtil.java similarity index 93% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java rename to Core/src/main/java/com/plotsquared/util/RegionUtil.java index 04629d1ac..f3b57dae3 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RegionUtil.java +++ b/Core/src/main/java/com/plotsquared/util/RegionUtil.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.object.Plot; +import com.plotsquared.plot.Plot; import com.sk89q.worldedit.math.BlockVector3; import com.sk89q.worldedit.regions.CuboidRegion; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java b/Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java similarity index 84% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java rename to Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java index 92ace2550..3747ffb3e 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/RuntimeExceptionRunnableVal.java +++ b/Core/src/main/java/com/plotsquared/util/RuntimeExceptionRunnableVal.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.tasks.RunnableVal; import lombok.RequiredArgsConstructor; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java b/Core/src/main/java/com/plotsquared/util/SchematicHandler.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java rename to Core/src/main/java/com/plotsquared/util/SchematicHandler.java index c3ca3cc20..a431e4615 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SchematicHandler.java +++ b/Core/src/main/java/com/plotsquared/util/SchematicHandler.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.generator.ClassicPlotWorld; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandler; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.schematic.Schematic; -import com.github.intellectualsites.plotsquared.queue.LocalBlockQueue; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Settings; +import com.plotsquared.generator.ClassicPlotWorld; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.util.uuid.UUIDHandler; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.schematic.Schematic; +import com.plotsquared.queue.LocalBlockQueue; +import com.plotsquared.util.tasks.TaskManager; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.NBTInputStream; import com.sk89q.jnbt.NBTOutputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java b/Core/src/main/java/com/plotsquared/util/SetupUtils.java similarity index 61% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java rename to Core/src/main/java/com/plotsquared/util/SetupUtils.java index 4163b0ed8..922f58a63 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/SetupUtils.java +++ b/Core/src/main/java/com/plotsquared/util/SetupUtils.java @@ -1,8 +1,8 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.generator.GeneratorWrapper; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.SetupObject; +import com.plotsquared.generator.GeneratorWrapper; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.SetupObject; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java b/Core/src/main/java/com/plotsquared/util/StringComparison.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java rename to Core/src/main/java/com/plotsquared/util/StringComparison.java index c5056520e..84a0daeb1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringComparison.java +++ b/Core/src/main/java/com/plotsquared/util/StringComparison.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; import java.util.ArrayList; import java.util.Collection; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java b/Core/src/main/java/com/plotsquared/util/StringMan.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java rename to Core/src/main/java/com/plotsquared/util/StringMan.java index e29b761be..151769135 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/StringMan.java +++ b/Core/src/main/java/com/plotsquared/util/StringMan.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.plot.config.Caption; +import com.plotsquared.config.Caption; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Array; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java b/Core/src/main/java/com/plotsquared/util/StringWrapper.java similarity index 96% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java rename to Core/src/main/java/com/plotsquared/util/StringWrapper.java index 12d0a11aa..8c96802a6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/StringWrapper.java +++ b/Core/src/main/java/com/plotsquared/util/StringWrapper.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.util; /** * diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java b/Core/src/main/java/com/plotsquared/util/WorldUtil.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java rename to Core/src/main/java/com/plotsquared/util/WorldUtil.java index b27d9cb6f..905f920ad 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/WorldUtil.java +++ b/Core/src/main/java/com/plotsquared/util/WorldUtil.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.util; +package com.plotsquared.util; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.object.Location; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.PlotSquared; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; import com.sk89q.jnbt.CompoundTag; import com.sk89q.jnbt.IntTag; import com.sk89q.jnbt.NBTInputStream; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java b/Core/src/main/java/com/plotsquared/util/area/QuadMap.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java rename to Core/src/main/java/com/plotsquared/util/area/QuadMap.java index d02c1b519..0a87c5732 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/area/QuadMap.java +++ b/Core/src/main/java/com/plotsquared/util/area/QuadMap.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util.area; +package com.plotsquared.util.area; -import com.github.intellectualsites.plotsquared.util.RegionUtil; +import com.plotsquared.util.RegionUtil; import com.sk89q.worldedit.regions.CuboidRegion; import java.util.HashSet; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java rename to Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java index 12fd72986..5ee2ed3f8 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpMenu.java +++ b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpMenu.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.util.helpmenu; +package com.plotsquared.util.helpmenu; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.commands.MainCommand; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.commands.Command; +import com.plotsquared.commands.CommandCategory; +import com.plotsquared.commands.MainCommand; +import com.plotsquared.player.PlotPlayer; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java similarity index 77% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java rename to Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java index 20a50efda..7b71c74c6 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpObject.java +++ b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpObject.java @@ -1,9 +1,9 @@ -package com.github.intellectualsites.plotsquared.util.helpmenu; +package com.plotsquared.util.helpmenu; -import com.github.intellectualsites.plotsquared.commands.Argument; -import com.github.intellectualsites.plotsquared.commands.Command; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.commands.Argument; +import com.plotsquared.commands.Command; +import com.plotsquared.config.Captions; +import com.plotsquared.util.StringMan; public class HelpObject { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java similarity index 73% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java rename to Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java index d3fbcb664..e93f55844 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/helpmenu/HelpPage.java +++ b/Core/src/main/java/com/plotsquared/util/helpmenu/HelpPage.java @@ -1,10 +1,10 @@ -package com.github.intellectualsites.plotsquared.util.helpmenu; +package com.plotsquared.util.helpmenu; -import com.github.intellectualsites.plotsquared.commands.CommandCategory; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.MainUtil; -import com.github.intellectualsites.plotsquared.util.StringMan; +import com.plotsquared.commands.CommandCategory; +import com.plotsquared.config.Captions; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.MainUtil; +import com.plotsquared.util.StringMan; import java.util.ArrayList; import java.util.List; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java b/Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java similarity index 83% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java rename to Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java index 307e651f9..d081fe4e1 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/logger/DelegateLogger.java +++ b/Core/src/main/java/com/plotsquared/util/logger/DelegateLogger.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util.logger; +package com.plotsquared.util.logger; public class DelegateLogger implements ILogger { diff --git a/Core/src/main/java/com/plotsquared/util/logger/ILogger.java b/Core/src/main/java/com/plotsquared/util/logger/ILogger.java new file mode 100644 index 000000000..aa8ccf4f6 --- /dev/null +++ b/Core/src/main/java/com/plotsquared/util/logger/ILogger.java @@ -0,0 +1,5 @@ +package com.plotsquared.util.logger; + +public interface ILogger { + void log(String message); +} diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java b/Core/src/main/java/com/plotsquared/util/net/HttpUtil.java similarity index 85% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java rename to Core/src/main/java/com/plotsquared/util/net/HttpUtil.java index e0207a0a4..578b76b70 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/HttpUtil.java +++ b/Core/src/main/java/com/plotsquared/util/net/HttpUtil.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util.net; +package com.plotsquared.util.net; -import com.github.intellectualsites.plotsquared.plot.config.Settings; +import com.plotsquared.config.Settings; import java.io.BufferedReader; import java.io.IOException; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java b/Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java similarity index 98% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java rename to Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java index f746aecda..8439a9404 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/net/IncendoPaster.java +++ b/Core/src/main/java/com/plotsquared/util/net/IncendoPaster.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.util.net; +package com.plotsquared.util.net; -import com.github.intellectualsites.plotsquared.PlotSquared; +import com.plotsquared.PlotSquared; import com.google.common.base.Charsets; import java.io.BufferedReader; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java b/Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java similarity index 60% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java rename to Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java index 0a7e914c2..01e254522 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/AutoClaimFinishTask.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/AutoClaimFinishTask.java @@ -1,18 +1,18 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.commands.Auto; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.events.PlotMergeEvent; -import com.github.intellectualsites.plotsquared.events.Result; -import com.github.intellectualsites.plotsquared.plot.object.Direction; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.PlotSquared; +import com.plotsquared.commands.Auto; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.Result; +import com.plotsquared.location.Direction; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.player.PlotPlayer; import lombok.RequiredArgsConstructor; -import static com.github.intellectualsites.plotsquared.util.MainUtil.sendMessage; +import static com.plotsquared.util.MainUtil.sendMessage; @RequiredArgsConstructor public final class AutoClaimFinishTask extends RunnableVal { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java b/Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java rename to Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java index 05a3237f9..ff1e5aaee 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/ObjectTaskRunnable.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/ObjectTaskRunnable.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; import lombok.RequiredArgsConstructor; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java similarity index 82% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java rename to Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java index 255994e12..e039cd9f4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; public abstract class RunnableVal implements Runnable { public T value; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java similarity index 86% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java rename to Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java index c57c06459..3f351e675 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal2.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal2.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; public abstract class RunnableVal2 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java similarity index 88% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java rename to Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java index 3ed053161..d65786380 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/RunnableVal3.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/RunnableVal3.java @@ -1,4 +1,4 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; public abstract class RunnableVal3 implements Runnable { public T value1; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java b/Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java similarity index 95% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java rename to Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java index 9978b8073..4eeb60d15 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/tasks/TaskManager.java +++ b/Core/src/main/java/com/plotsquared/util/tasks/TaskManager.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.util.tasks; +package com.plotsquared.util.tasks; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.util.RuntimeExceptionRunnableVal; +import com.plotsquared.PlotSquared; +import com.plotsquared.util.RuntimeExceptionRunnableVal; import java.util.Collection; import java.util.HashMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java b/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java similarity index 89% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java rename to Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java index 818e46cbb..5dce90e5d 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandler.java +++ b/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandler.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.util.uuid; +package com.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.database.DBFunc; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.StringWrapper; import com.google.common.collect.BiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java b/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java similarity index 92% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java rename to Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java index c8e822e33..f1e780578 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDHandlerImplementation.java +++ b/Core/src/main/java/com/plotsquared/util/uuid/UUIDHandlerImplementation.java @@ -1,16 +1,16 @@ -package com.github.intellectualsites.plotsquared.util.uuid; +package com.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.PlotSquared; -import com.github.intellectualsites.plotsquared.plot.config.Captions; -import com.github.intellectualsites.plotsquared.plot.config.Settings; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.util.StringMan; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.object.StringWrapper; -import com.github.intellectualsites.plotsquared.util.tasks.TaskManager; +import com.plotsquared.PlotSquared; +import com.plotsquared.config.Captions; +import com.plotsquared.config.Settings; +import com.plotsquared.database.DBFunc; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.plot.Plot; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.util.StringMan; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.StringWrapper; +import com.plotsquared.util.tasks.TaskManager; import com.google.common.base.Charsets; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java b/Core/src/main/java/com/plotsquared/util/uuid/UUIDWrapper.java similarity index 70% rename from Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java rename to Core/src/main/java/com/plotsquared/util/uuid/UUIDWrapper.java index 9642dc77e..0bb635e56 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/util/uuid/UUIDWrapper.java +++ b/Core/src/main/java/com/plotsquared/util/uuid/UUIDWrapper.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.util.uuid; +package com.plotsquared.util.uuid; -import com.github.intellectualsites.plotsquared.player.OfflinePlotPlayer; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; +import com.plotsquared.player.OfflinePlotPlayer; +import com.plotsquared.player.PlotPlayer; import org.jetbrains.annotations.NotNull; import java.util.UUID; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java b/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java deleted file mode 100644 index 89963ee56..000000000 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/UUIDHandlerImplementationTest.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.github.intellectualsites.plotsquared.plot.util; - -import com.github.intellectualsites.plotsquared.database.AbstractDBTest; -import com.github.intellectualsites.plotsquared.database.DBFunc; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDHandlerImplementation; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.util.uuid.UUIDWrapper; -import org.junit.Before; - -import java.util.UUID; - -public class UUIDHandlerImplementationTest extends UUIDHandlerImplementation { - - public UUIDHandlerImplementationTest(UUIDWrapper wrapper) { - super(wrapper); - } - - @Before public void setUp() throws Exception { - DBFunc.dbManager = new AbstractDBTest(); - } - - @Override public void fetchUUID(String name, RunnableVal ifFetch) { - - } -} diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java b/Core/src/test/java/com/plotsquared/database/AbstractDBTest.java similarity index 89% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java rename to Core/src/test/java/com/plotsquared/database/AbstractDBTest.java index 9b4194a87..a9af554c6 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/database/AbstractDBTest.java +++ b/Core/src/test/java/com/plotsquared/database/AbstractDBTest.java @@ -1,12 +1,12 @@ -package com.github.intellectualsites.plotsquared.database; +package com.plotsquared.database; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.Plot; -import com.github.intellectualsites.plotsquared.plot.object.PlotArea; -import com.github.intellectualsites.plotsquared.plot.object.PlotCluster; -import com.github.intellectualsites.plotsquared.plot.object.PlotId; -import com.github.intellectualsites.plotsquared.util.tasks.RunnableVal; -import com.github.intellectualsites.plotsquared.plot.comment.PlotComment; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotCluster; +import com.plotsquared.plot.PlotId; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.plot.comment.PlotComment; import org.jetbrains.annotations.NotNull; import java.util.HashMap; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java b/Core/src/test/java/com/plotsquared/plot/FlagTest.java similarity index 87% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java rename to Core/src/test/java/com/plotsquared/plot/FlagTest.java index 6f61cffc0..f6944953b 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/FlagTest.java +++ b/Core/src/test/java/com/plotsquared/plot/FlagTest.java @@ -1,7 +1,7 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.database.AbstractDBTest; -import com.github.intellectualsites.plotsquared.database.DBFunc; +import com.plotsquared.database.AbstractDBTest; +import com.plotsquared.database.DBFunc; import com.sk89q.worldedit.world.item.ItemType; import org.junit.Before; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java b/Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java similarity index 71% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java rename to Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java index 5b7646750..b957aff85 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/PlotVersionTest.java +++ b/Core/src/test/java/com/plotsquared/plot/PlotVersionTest.java @@ -1,6 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot; +package com.plotsquared.plot; -import com.github.intellectualsites.plotsquared.PlotVersion; +import com.plotsquared.PlotVersion; import org.junit.Test; public class PlotVersionTest { diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java b/Core/src/test/java/com/plotsquared/plot/object/LocationTest.java similarity index 86% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java rename to Core/src/test/java/com/plotsquared/plot/object/LocationTest.java index a421137c0..68fe99093 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/object/LocationTest.java +++ b/Core/src/test/java/com/plotsquared/plot/object/LocationTest.java @@ -1,5 +1,6 @@ -package com.github.intellectualsites.plotsquared.plot.object; +package com.plotsquared.plot.object; +import com.plotsquared.location.Location; import org.junit.Test; import java.util.logging.Logger; diff --git a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java b/Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java similarity index 66% rename from Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java rename to Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java index 36e902c5d..92efbdb7f 100644 --- a/Core/src/test/java/com/github/intellectualsites/plotsquared/plot/util/EventDispatcherTest.java +++ b/Core/src/test/java/com/plotsquared/plot/util/EventDispatcherTest.java @@ -1,10 +1,33 @@ -package com.github.intellectualsites.plotsquared.plot.util; +package com.plotsquared.plot.util; -import com.github.intellectualsites.plotsquared.events.*; -import com.github.intellectualsites.plotsquared.player.PlotPlayer; -import com.github.intellectualsites.plotsquared.plot.flags.PlotFlag; -import com.github.intellectualsites.plotsquared.plot.object.*; -import com.github.intellectualsites.plotsquared.util.EventDispatcher; +import com.plotsquared.events.PlayerAutoPlotEvent; +import com.plotsquared.events.PlayerClaimPlotEvent; +import com.plotsquared.events.PlayerEnterPlotEvent; +import com.plotsquared.events.PlayerLeavePlotEvent; +import com.plotsquared.events.PlayerPlotDeniedEvent; +import com.plotsquared.events.PlayerPlotHelperEvent; +import com.plotsquared.events.PlayerPlotTrustedEvent; +import com.plotsquared.events.PlayerTeleportToPlotEvent; +import com.plotsquared.events.PlotAutoMergeEvent; +import com.plotsquared.events.PlotChangeOwnerEvent; +import com.plotsquared.events.PlotClearEvent; +import com.plotsquared.events.PlotComponentSetEvent; +import com.plotsquared.events.PlotDeleteEvent; +import com.plotsquared.events.PlotDoneEvent; +import com.plotsquared.events.PlotFlagAddEvent; +import com.plotsquared.events.PlotFlagRemoveEvent; +import com.plotsquared.events.PlotMergeEvent; +import com.plotsquared.events.PlotRateEvent; +import com.plotsquared.events.PlotUnlinkEvent; +import com.plotsquared.player.PlotPlayer; +import com.plotsquared.plot.flags.PlotFlag; +import com.plotsquared.location.Direction; +import com.plotsquared.location.Location; +import com.plotsquared.plot.Plot; +import com.plotsquared.plot.PlotArea; +import com.plotsquared.plot.PlotId; +import com.plotsquared.plot.Rating; +import com.plotsquared.util.EventDispatcher; import com.sk89q.worldedit.function.pattern.Pattern; import java.util.List; diff --git a/Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java b/Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java new file mode 100644 index 000000000..4b5f483bd --- /dev/null +++ b/Core/src/test/java/com/plotsquared/plot/util/UUIDHandlerImplementationTest.java @@ -0,0 +1,25 @@ +package com.plotsquared.plot.util; + +import com.plotsquared.database.AbstractDBTest; +import com.plotsquared.database.DBFunc; +import com.plotsquared.util.uuid.UUIDHandlerImplementation; +import com.plotsquared.util.tasks.RunnableVal; +import com.plotsquared.util.uuid.UUIDWrapper; +import org.junit.Before; + +import java.util.UUID; + +public class UUIDHandlerImplementationTest extends UUIDHandlerImplementation { + + public UUIDHandlerImplementationTest(UUIDWrapper wrapper) { + super(wrapper); + } + + @Before public void setUp() throws Exception { + DBFunc.dbManager = new AbstractDBTest(); + } + + @Override public void fetchUUID(String name, RunnableVal ifFetch) { + + } +} diff --git a/buildSrc/build/libs/buildSrc.jar b/buildSrc/build/libs/buildSrc.jar new file mode 100644 index 0000000000000000000000000000000000000000..3c68c8ea09ad7e78db79a2e191f0775a824d438c GIT binary patch literal 261 zcmWIWW@h1HVBp|jST(yVfB^`YKm-tQ0