From 3d5ee7b5719eb4b53874e5f07412332d2c1cd894 Mon Sep 17 00:00:00 2001 From: wizjany Date: Fri, 13 Nov 2015 19:12:55 -0500 Subject: [PATCH] Gradle-ize. Prep for Sponge. Old Bukkit code can still be found in the worldguard-legacy folder and built with `gradle worldguard-legacy:build`. Hopefully nothing got lost in the gradle-ization. --- .gitignore | 4 + build.gradle | 131 ++ config/checkstyle/checkstyle.xml | 64 + config/checkstyle/header.txt | 4 +- config/checkstyle/import-control.xml | 53 +- gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 164 ++ gradlew.bat | 90 + settings.gradle | 3 + worldguard-core/build.gradle | 23 + worldguard-core/worldguard-core.iml | 33 + worldguard-legacy/build.gradle | 42 + .../config}/assembly/default.xml | 0 .../config/checkstyle/header.txt | 18 + .../config/checkstyle/import-control.xml | 41 + .../config}/markdown/footer.html | 0 .../config}/markdown/header.html | 0 .../contrib}/blacklist_table.sql | 0 .../region_manual_update_20110325.sql | 0 .../defaults}/blacklist.txt | 128 +- .../defaults}/config.yml | 42 +- .../defaults}/config_world.yml | 40 +- .../migrations/region/mysql/V1__Initial.sql | 0 .../region/mysql/V2__Bug_fix_and_UUID.sql | 0 .../migrations/region/sqlite/V1__Initial.sql | 0 .../defaults}/plugin.yml | 8 +- pom.xml => worldguard-legacy/pom.xml | 0 .../com/sk89q/worldguard/LocalPlayer.java | 244 +- .../sk89q/worldguard/blacklist/Blacklist.java | 0 .../worldguard/blacklist/BlacklistEntry.java | 0 .../blacklist/BlacklistLoggerHandler.java | 0 .../worldguard/blacklist/MatcherIndex.java | 0 .../worldguard/blacklist/TrackedEvent.java | 0 .../worldguard/blacklist/action/Action.java | 0 .../blacklist/action/ActionResult.java | 0 .../blacklist/action/ActionType.java | 0 .../blacklist/action/AllowAction.java | 0 .../blacklist/action/BanAction.java | 0 .../blacklist/action/DenyAction.java | 0 .../blacklist/action/KickAction.java | 0 .../blacklist/action/LogAction.java | 0 .../blacklist/action/NotifyAction.java | 0 .../blacklist/action/RepeatGuardedAction.java | 0 .../blacklist/action/TellAction.java | 0 .../event/AbstractBlacklistEvent.java | 0 .../blacklist/event/BlacklistEvent.java | 0 .../blacklist/event/BlockBlacklistEvent.java | 0 .../event/BlockBreakBlacklistEvent.java | 0 .../event/BlockDispenseBlacklistEvent.java | 0 .../event/BlockInteractBlacklistEvent.java | 0 .../event/BlockPlaceBlacklistEvent.java | 0 .../worldguard/blacklist/event/EventType.java | 0 .../event/ItemAcquireBlacklistEvent.java | 0 .../blacklist/event/ItemBlacklistEvent.java | 0 .../event/ItemDestroyWithBlacklistEvent.java | 0 .../event/ItemDropBlacklistEvent.java | 0 .../event/ItemUseBlacklistEvent.java | 0 .../blacklist/logger/ConsoleHandler.java | 0 .../blacklist/logger/DatabaseHandler.java | 0 .../blacklist/logger/FileHandler.java | 0 .../blacklist/logger/LogFileWriter.java | 0 .../blacklist/logger/LoggerHandler.java | 0 .../worldguard/blacklist/target/DataMask.java | 0 .../target/DataValueRangeMatcher.java | 0 .../blacklist/target/MaterialTarget.java | 0 .../blacklist/target/RangeMask.java | 0 .../worldguard/blacklist/target/Target.java | 0 .../blacklist/target/TargetMatcher.java | 0 .../target/TargetMatcherParseException.java | 0 .../blacklist/target/TargetMatcherParser.java | 0 .../blacklist/target/WildcardDataMatcher.java | 0 .../bukkit/BukkitOfflinePlayer.java | 0 .../sk89q/worldguard/bukkit/BukkitPlayer.java | 222 +- .../sk89q/worldguard/bukkit/BukkitUtil.java | 816 +++---- .../bukkit/ConfigurationManager.java | 0 .../worldguard/bukkit/ProtectionQuery.java | 0 .../sk89q/worldguard/bukkit/QueryCache.java | 0 .../worldguard/bukkit/RegionContainer.java | 0 .../sk89q/worldguard/bukkit/RegionQuery.java | 0 .../com/sk89q/worldguard/bukkit/WGBukkit.java | 0 .../worldguard/bukkit/WorldConfiguration.java | 0 .../worldguard/bukkit/WorldGuardPlugin.java | 2032 ++++++++--------- .../sk89q/worldguard/bukkit/cause/Cause.java | 0 .../bukkit/commands/AsyncCommandHelper.java | 0 .../bukkit/commands/CommandUtils.java | 0 .../bukkit/commands/DebuggingCommands.java | 0 .../commands/FutureProgressListener.java | 0 .../bukkit/commands/GeneralCommands.java | 622 ++--- .../commands/MessageFutureCallback.java | 0 .../bukkit/commands/MessageTimerTask.java | 0 .../bukkit/commands/ProtectionCommands.java | 92 +- .../bukkit/commands/ToggleCommands.java | 330 +-- .../bukkit/commands/WorldGuardCommands.java | 592 ++--- .../commands/region/MemberCommands.java | 0 .../commands/region/RegionCommands.java | 0 .../commands/region/RegionCommandsBase.java | 0 .../region/RegionPrintoutBuilder.java | 0 .../bukkit/commands/task/RegionAdder.java | 0 .../bukkit/commands/task/RegionLister.java | 0 .../commands/task/RegionManagerReloader.java | 0 .../commands/task/RegionManagerSaver.java | 0 .../bukkit/commands/task/RegionRemover.java | 0 .../worldguard/bukkit/event/BulkEvent.java | 0 .../bukkit/event/DelegateEvent.java | 0 .../bukkit/event/DelegateEvents.java | 0 .../worldguard/bukkit/event/Handleable.java | 0 .../event/block/AbstractBlockEvent.java | 0 .../bukkit/event/block/BreakBlockEvent.java | 0 .../bukkit/event/block/PlaceBlockEvent.java | 0 .../bukkit/event/block/UseBlockEvent.java | 0 .../bukkit/event/debug/CancelAttempt.java | 0 .../bukkit/event/debug/CancelLogger.java | 0 .../bukkit/event/debug/CancelLogging.java | 0 .../event/debug/LoggingBlockBreakEvent.java | 0 .../event/debug/LoggingBlockPlaceEvent.java | 0 .../LoggingEntityDamageByEntityEvent.java | 0 .../debug/LoggingPlayerInteractEvent.java | 0 .../event/entity/AbstractEntityEvent.java | 0 .../event/entity/DamageEntityEvent.java | 0 .../event/entity/DestroyEntityEvent.java | 0 .../bukkit/event/entity/SpawnEntityEvent.java | 0 .../bukkit/event/entity/UseEntityEvent.java | 0 .../bukkit/event/inventory/UseItemEvent.java | 0 .../event/player/ProcessPlayerEvent.java | 0 .../bukkit/internal/BukkitBlacklist.java | 0 .../bukkit/internal/TargetMatcherSet.java | 0 .../bukkit/internal/WGMetadata.java | 0 .../bukkit/listener/AbstractListener.java | 0 .../bukkit/listener/BlacklistListener.java | 0 .../listener/BlockStateAsBlockFunction.java | 0 .../listener/BlockedPotionsListener.java | 0 .../listener/BuildPermissionListener.java | 0 .../listener/ChestProtectionListener.java | 0 .../bukkit/listener/DebuggingListener.java | 0 .../listener/EventAbstractionListener.java | 0 .../listener/InvincibilityListener.java | 0 .../bukkit/listener/PlayerModesListener.java | 0 .../bukkit/listener/PlayerMoveListener.java | 0 .../bukkit/listener/RegionFlagsListener.java | 0 .../listener/RegionProtectionListener.java | 0 .../bukkit/listener/SpongeUtil.java | 0 .../listener/WorldGuardBlockListener.java | 0 .../WorldGuardCommandBookListener.java | 0 .../listener/WorldGuardEntityListener.java | 0 .../listener/WorldGuardHangingListener.java | 0 .../listener/WorldGuardPlayerListener.java | 0 .../listener/WorldGuardServerListener.java | 0 .../listener/WorldGuardVehicleListener.java | 0 .../listener/WorldGuardWeatherListener.java | 0 .../listener/WorldGuardWorldListener.java | 0 .../bukkit/listener/WorldRulesListener.java | 0 .../listener/debounce/BlockBlockPair.java | 0 .../listener/debounce/BlockMaterialPair.java | 0 .../debounce/BlockPistonExtendKey.java | 0 .../debounce/BlockPistonRetractKey.java | 0 .../listener/debounce/EventDebounce.java | 0 .../legacy/AbstractEventDebounce.java | 0 .../legacy/BlockEntityEventDebounce.java | 0 .../legacy/EntityEntityEventDebounce.java | 0 .../InventoryMoveItemEventDebounce.java | 0 .../permission/AbstractPermissionModel.java | 0 .../permission/RegionPermissionModel.java | 0 .../DelayedRegionOverlapAssociation.java | 0 .../sk89q/worldguard/bukkit/util/Blocks.java | 0 .../worldguard/bukkit/util/Entities.java | 0 .../sk89q/worldguard/bukkit/util/Events.java | 0 .../worldguard/bukkit/util/HandlerTracer.java | 0 .../worldguard/bukkit/util/InteropUtils.java | 0 .../worldguard/bukkit/util/Locations.java | 0 .../worldguard/bukkit/util/Materials.java | 0 .../util/logging/LoggerToChatHandler.java | 0 .../bukkit/util/report/ConfigReport.java | 0 .../bukkit/util/report/PerformanceReport.java | 0 .../bukkit/util/report/PluginReport.java | 0 .../bukkit/util/report/SchedulerReport.java | 0 .../bukkit/util/report/ServerReport.java | 0 .../bukkit/util/report/ServicesReport.java | 0 .../bukkit/util/report/WorldReport.java | 0 .../worldguard/chest/ChestProtection.java | 152 +- .../worldguard/chest/SignChestProtection.java | 318 +-- .../sk89q/worldguard/domains/Association.java | 0 .../worldguard/domains/DefaultDomain.java | 742 +++--- .../com/sk89q/worldguard/domains/Domain.java | 146 +- .../worldguard/domains/DomainCollection.java | 182 +- .../sk89q/worldguard/domains/GroupDomain.java | 302 +-- .../worldguard/domains/PlayerDomain.java | 420 ++-- .../worldguard/internal/PermissionModel.java | 0 .../internal/util/sql/StatementUtils.java | 0 .../protection/AbstractRegionSet.java | 0 .../protection/ApplicableRegionSet.java | 488 ++-- .../protection/FailedLoadRegionSet.java | 0 .../protection/FlagValueCalculator.java | 0 .../protection/GlobalRegionManager.java | 0 .../protection/PermissiveRegionSet.java | 0 .../protection/RegionResultSet.java | 0 .../UnsupportedIntersectionException.java | 60 +- .../protection/association/Associables.java | 0 .../association/ConstantAssociation.java | 0 .../association/RegionAssociable.java | 0 .../association/RegionOverlapAssociation.java | 0 .../protection/events/DisallowedPVPEvent.java | 162 +- .../protection/flags/BooleanFlag.java | 140 +- .../protection/flags/BuildFlag.java | 0 .../protection/flags/CommandStringFlag.java | 124 +- .../protection/flags/DefaultFlag.java | 0 .../protection/flags/DoubleFlag.java | 0 .../protection/flags/EntityTypeFlag.java | 106 +- .../worldguard/protection/flags/EnumFlag.java | 208 +- .../worldguard/protection/flags/Flag.java | 0 .../protection/flags/IntegerFlag.java | 0 .../protection/flags/InvalidFlagFormat.java | 58 +- .../protection/flags/LazyLocation.java | 0 .../protection/flags/LocationFlag.java | 0 .../protection/flags/RegionGroup.java | 0 .../protection/flags/RegionGroupFlag.java | 0 .../worldguard/protection/flags/SetFlag.java | 204 +- .../protection/flags/StateFlag.java | 0 .../protection/flags/StringFlag.java | 0 .../protection/flags/VectorFlag.java | 0 .../managers/RegionContainerImpl.java | 0 .../protection/managers/RegionDifference.java | 0 .../protection/managers/RegionManager.java | 0 .../protection/managers/RemovalStrategy.java | 0 .../managers/index/AbstractRegionIndex.java | 0 .../managers/index/ChunkHashTable.java | 0 .../managers/index/ConcurrentRegionIndex.java | 0 .../managers/index/HashMapIndex.java | 0 .../managers/index/PriorityRTreeIndex.java | 0 .../managers/index/RegionIndex.java | 0 .../managers/migration/AbstractMigration.java | 0 .../managers/migration/DriverMigration.java | 0 .../managers/migration/Migration.java | 0 .../migration/MigrationException.java | 0 .../managers/migration/UUIDMigration.java | 0 .../storage/DifferenceSaveException.java | 0 .../managers/storage/DriverType.java | 0 .../storage/MemoryRegionDatabase.java | 0 .../managers/storage/RegionDatabase.java | 0 .../managers/storage/RegionDatabaseUtils.java | 0 .../managers/storage/RegionDriver.java | 0 .../managers/storage/StorageException.java | 0 .../storage/file/DirectoryYamlDriver.java | 0 .../managers/storage/file/YamlRegionFile.java | 0 .../managers/storage/sql/DataLoader.java | 0 .../managers/storage/sql/DataUpdater.java | 0 .../storage/sql/DomainTableCache.java | 0 .../managers/storage/sql/RegionInserter.java | 0 .../managers/storage/sql/RegionRemover.java | 0 .../managers/storage/sql/RegionUpdater.java | 0 .../managers/storage/sql/SQLDriver.java | 0 .../storage/sql/SQLRegionDatabase.java | 0 .../managers/storage/sql/StatementBatch.java | 0 .../managers/storage/sql/TableCache.java | 0 .../regions/GlobalProtectedRegion.java | 184 +- .../regions/ProtectedCuboidRegion.java | 0 .../regions/ProtectedPolygonalRegion.java | 0 .../protection/regions/ProtectedRegion.java | 0 .../regions/ProtectedRegionMBRConverter.java | 0 .../protection/regions/RegionType.java | 0 .../protection/util/DomainInputResolver.java | 0 .../protection/util/NormativeOrders.java | 0 .../util/RegionCollectionConsumer.java | 0 .../util/UnresolvedNamesException.java | 0 .../sk89q/worldguard/session/MoveType.java | 0 .../com/sk89q/worldguard/session/Session.java | 0 .../worldguard/session/SessionManager.java | 0 .../worldguard/session/WorldPlayerTuple.java | 0 .../worldguard/session/handler/EntryFlag.java | 0 .../worldguard/session/handler/ExitFlag.java | 0 .../session/handler/FarewellFlag.java | 0 .../worldguard/session/handler/FeedFlag.java | 0 .../handler/FlagValueChangeHandler.java | 0 .../session/handler/GameModeFlag.java | 0 .../worldguard/session/handler/GodMode.java | 0 .../session/handler/GreetingFlag.java | 0 .../worldguard/session/handler/Handler.java | 0 .../worldguard/session/handler/HealFlag.java | 0 .../session/handler/InvincibilityFlag.java | 0 .../session/handler/NotifyEntryFlag.java | 0 .../session/handler/NotifyExitFlag.java | 0 .../session/handler/TimeLockFlag.java | 0 .../session/handler/WaterBreathing.java | 0 .../session/handler/WeatherLockFlag.java | 0 .../sk89q/worldguard/util/ChangeTracked.java | 0 .../java/com/sk89q/worldguard/util/Enums.java | 0 .../com/sk89q/worldguard/util/MathUtils.java | 0 .../com/sk89q/worldguard/util/Normal.java | 0 .../worldguard/util/collect/EntryBase.java | 0 .../util/collect/LongBaseHashTable.java | 0 .../worldguard/util/collect/LongHash.java | 0 .../worldguard/util/collect/LongHashSet.java | 0 .../util/collect/LongHashTable.java | 0 .../util/command/CommandFilter.java | 0 .../util/concurrent/EvenMoreExecutors.java | 0 .../com/sk89q/worldguard/util/io/Closer.java | 0 .../util/logging/ClassSourceValidator.java | 0 .../util/logging/RecordMessagePrefixer.java | 0 .../worldguard/util/net/HttpRequest.java | 0 .../worldguard/util/paste/EngineHubPaste.java | 0 .../sk89q/worldguard/util/paste/Pastebin.java | 0 .../sk89q/worldguard/util/paste/Paster.java | 0 .../sk89q/worldguard/util/paste/Pasters.java | 0 .../util/profiler/SamplerBuilder.java | 0 .../worldguard/util/profiler/StackNode.java | 0 .../util/profiler/StackTraceNode.java | 0 .../util/profiler/ThreadIdFilter.java | 0 .../util/profiler/ThreadNameFilter.java | 0 .../worldguard/util/report/CancelReport.java | 0 .../worldguard/util/report/DataReport.java | 0 .../worldguard/util/report/RegionReport.java | 0 .../sk89q/worldguard/util/report/Report.java | 0 .../worldguard/util/report/ReportList.java | 0 .../util/report/ShallowObjectReport.java | 0 .../util/report/StackTraceReport.java | 0 .../util/report/SystemInfoReport.java | 0 .../worldguard/util/report/Unreported.java | 0 .../worldguard/util/sql/DataSourceConfig.java | 0 .../worldguard/util/task/AbstractTask.java | 0 .../util/task/FutureForwardingTask.java | 0 .../util/task/SimpleSupervisor.java | 0 .../worldguard/util/task/Supervisor.java | 0 .../com/sk89q/worldguard/util/task/Task.java | 0 .../util/task/TaskStateComparator.java | 0 .../util/task/progress/Progress.java | 0 .../util/task/progress/ProgressIterator.java | 0 .../task/progress/ProgressObservable.java | 0 .../src/main/resources/defaults/blacklist.txt | 65 + .../src/main/resources/defaults/config.yml | 22 + .../main/resources/defaults/config_world.yml | 21 + .../migrations/region/mysql/V1__Initial.sql | 212 ++ .../region/mysql/V2__Bug_fix_and_UUID.sql | 27 + .../migrations/region/sqlite/V1__Initial.sql | 160 ++ .../src/main/resources/plugin.yml | 4 + .../java/com/sk89q/worldguard/TestPlayer.java | 174 +- .../worldguard/domains/DefaultDomainTest.java | 0 .../protection/ApplicableRegionSetTest.java | 1282 +++++------ .../protection/FlagValueCalculatorTest.java | 0 .../protection/HashMapIndexPriorityTest.java | 0 .../HashMapIndexRegionOverlapTest.java | 0 .../protection/HashMapIndexTest.java | 0 .../protection/MockApplicableRegionSet.java | 198 +- .../protection/PriorityRTreeIndexTest.java | 0 .../PriorityRTreeRegionEntryExitTest.java | 0 .../PriorityRTreeRegionOverlapTest.java | 0 .../PriorityRTreeRegionPriorityTest.java | 0 .../protection/RegionEntryExitTest.java | 0 .../protection/RegionOverlapTest.java | 362 +-- .../protection/RegionPriorityTest.java | 320 +-- .../regions/RegionIntersectTest.java | 0 .../worldguard/util/CommandFilterTest.java | 0 worldguard-legacy/worldguard-legacy.iml | 47 + worldguard-sponge/build.gradle | 16 + worldguard-sponge/worldguard-sponge.iml | 38 + 354 files changed, 7006 insertions(+), 5782 deletions(-) create mode 100644 build.gradle create mode 100644 config/checkstyle/checkstyle.xml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 worldguard-core/build.gradle create mode 100644 worldguard-core/worldguard-core.iml create mode 100644 worldguard-legacy/build.gradle rename {config => worldguard-legacy/config}/assembly/default.xml (100%) create mode 100644 worldguard-legacy/config/checkstyle/header.txt create mode 100644 worldguard-legacy/config/checkstyle/import-control.xml rename {config => worldguard-legacy/config}/markdown/footer.html (100%) rename {config => worldguard-legacy/config}/markdown/header.html (100%) rename {contrib => worldguard-legacy/contrib}/blacklist_table.sql (100%) rename {contrib => worldguard-legacy/contrib}/region_manual_update_20110325.sql (100%) rename {src/main/resources => worldguard-legacy/defaults}/blacklist.txt (97%) rename {src/main/resources => worldguard-legacy/defaults}/config.yml (97%) rename {src/main/resources => worldguard-legacy/defaults}/config_world.yml (97%) rename {src/main/resources => worldguard-legacy/defaults}/migrations/region/mysql/V1__Initial.sql (100%) rename {src/main/resources => worldguard-legacy/defaults}/migrations/region/mysql/V2__Bug_fix_and_UUID.sql (100%) rename {src/main/resources => worldguard-legacy/defaults}/migrations/region/sqlite/V1__Initial.sql (100%) rename {src/main/resources => worldguard-legacy/defaults}/plugin.yml (97%) rename pom.xml => worldguard-legacy/pom.xml (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/LocalPlayer.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/Blacklist.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/BlacklistLoggerHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/MatcherIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/TrackedEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/Action.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/ActionResult.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/ActionType.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/AllowAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/BanAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/DenyAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/KickAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/LogAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/NotifyAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/RepeatGuardedAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/action/TellAction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/AbstractBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlockBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlockBreakBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlockDispenseBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlockInteractBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/BlockPlaceBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/EventType.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/ItemAcquireBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/ItemBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/ItemDestroyWithBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/ItemDropBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/event/ItemUseBlacklistEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/logger/ConsoleHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/logger/LogFileWriter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/logger/LoggerHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/DataMask.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/DataValueRangeMatcher.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/MaterialTarget.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/RangeMask.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/Target.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcher.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParseException.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/blacklist/target/WildcardDataMatcher.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/QueryCache.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/DebuggingCommands.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/region/MemberCommands.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionAdder.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionLister.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerReloader.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerSaver.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionRemover.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/internal/BukkitBlacklist.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/SpongeUtil.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockBlockPair.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockMaterialPair.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/permission/AbstractPermissionModel.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/protection/DelayedRegionOverlapAssociation.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/Entities.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/Events.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/Locations.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/Materials.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/logging/LoggerToChatHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/ConfigReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/chest/ChestProtection.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/chest/SignChestProtection.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/Association.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/DefaultDomain.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/Domain.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/DomainCollection.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/GroupDomain.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/domains/PlayerDomain.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/internal/PermissionModel.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/internal/util/sql/StatementUtils.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/AbstractRegionSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/FailedLoadRegionSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/PermissiveRegionSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/RegionResultSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/association/Associables.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/association/ConstantAssociation.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/association/RegionAssociable.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/association/RegionOverlapAssociation.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/BuildFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/Flag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java (97%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/LazyLocation.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/RegionContainerImpl.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/RegionDifference.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/RemovalStrategy.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/AbstractRegionIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/ConcurrentRegionIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/HashMapIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/index/RegionIndex.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/migration/AbstractMigration.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/migration/DriverMigration.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/migration/Migration.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/migration/MigrationException.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/DifferenceSaveException.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/DriverType.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/MemoryRegionDatabase.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabase.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabaseUtils.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDriver.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/StorageException.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/file/DirectoryYamlDriver.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataLoader.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataUpdater.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DomainTableCache.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionRemover.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionUpdater.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLDriver.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/StatementBatch.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/managers/storage/sql/TableCache.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java (96%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/regions/RegionType.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/util/NormativeOrders.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/util/RegionCollectionConsumer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/protection/util/UnresolvedNamesException.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/MoveType.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/Session.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/SessionManager.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/FeedFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/FlagValueChangeHandler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/GodMode.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/Handler.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/HealFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/InvincibilityFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/NotifyEntryFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/NotifyExitFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/WaterBreathing.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/ChangeTracked.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/Enums.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/MathUtils.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/Normal.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/collect/EntryBase.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/collect/LongBaseHashTable.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/collect/LongHash.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/collect/LongHashSet.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/collect/LongHashTable.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/command/CommandFilter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/concurrent/EvenMoreExecutors.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/io/Closer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/logging/ClassSourceValidator.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/logging/RecordMessagePrefixer.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/net/HttpRequest.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/paste/EngineHubPaste.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/paste/Pastebin.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/paste/Paster.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/paste/Pasters.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/profiler/SamplerBuilder.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/profiler/StackNode.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/profiler/StackTraceNode.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/profiler/ThreadIdFilter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/profiler/ThreadNameFilter.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/CancelReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/DataReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/RegionReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/Report.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/ReportList.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/ShallowObjectReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/StackTraceReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/SystemInfoReport.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/report/Unreported.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/sql/DataSourceConfig.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/AbstractTask.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/FutureForwardingTask.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/SimpleSupervisor.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/Supervisor.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/Task.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/TaskStateComparator.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/progress/Progress.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/progress/ProgressIterator.java (100%) rename {src => worldguard-legacy/src}/main/java/com/sk89q/worldguard/util/task/progress/ProgressObservable.java (100%) create mode 100644 worldguard-legacy/src/main/resources/defaults/blacklist.txt create mode 100644 worldguard-legacy/src/main/resources/defaults/config.yml create mode 100644 worldguard-legacy/src/main/resources/defaults/config_world.yml create mode 100644 worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql create mode 100644 worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql create mode 100644 worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql create mode 100644 worldguard-legacy/src/main/resources/plugin.yml rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/TestPlayer.java (96%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java (97%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/HashMapIndexPriorityTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/HashMapIndexRegionOverlapTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/HashMapIndexTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java (97%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/PriorityRTreeIndexTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionEntryExitTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionOverlapTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionPriorityTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java (97%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java (97%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java (100%) rename {src => worldguard-legacy/src}/test/java/com/sk89q/worldguard/util/CommandFilterTest.java (100%) create mode 100644 worldguard-legacy/worldguard-legacy.iml create mode 100644 worldguard-sponge/build.gradle create mode 100644 worldguard-sponge/worldguard-sponge.iml diff --git a/.gitignore b/.gitignore index 9e3c43b2..8f30c6e0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ /target .DS_Store + /*.iml /.idea @@ -11,3 +12,6 @@ /dependency-reduced-pom.xml *-private.sh +/.gradle +**/build + diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..7103b3f3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,131 @@ +println """ +******************************************* + You are building WorldGuard! + + If you encounter trouble: + 1) Read COMPILING.md if you haven't yet + 2) Try running 'build' in a separate Gradle run + 3) Use gradlew and not gradle + 4) If you still need help, ask on IRC! irc.esper.net #sk89q + + Output files will be in [subproject]/build/libs +******************************************* +""" + +buildscript { + repositories { + mavenCentral() + maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" } + jcenter() + } + + configurations.all { + resolutionStrategy { + force 'com.google.guava:guava:17.0' + } + } + + dependencies { + classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.0' + classpath 'org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1' + classpath 'org.ajoberstar:gradle-git:0.12.0' + } +} + +if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost" +if (!project.hasProperty("artifactory_user")) ext.artifactory_user = "guest" +if (!project.hasProperty("artifactory_password")) ext.artifactory_password = "" + +if (!project.hasProperty("gitCommitHash")) { + try { + def repo = Grgit.open(project.file('.')) + ext.gitCommitHash = repo.head().abbreviatedId + } catch (Exception e) { + ext.gitCommitHash = "no_git_id" + } +} + +subprojects { + apply plugin: 'java' + apply plugin: 'maven' + apply plugin: 'checkstyle' + apply plugin: 'com.github.johnrengelman.shadow' + apply plugin: 'com.jfrog.artifactory-upload' + + group = 'com.sk89q.worldguard' + version = '7.0.0-SNAPSHOT' + ext.internalVersion = version + ";" + gitCommitHash + + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + + checkstyle.configFile = new File(rootProject.projectDir, "config/checkstyle/checkstyle.xml") + + repositories { + mavenCentral() + maven { url "http://repo.spongepowered.org/maven/" } + maven { url "https://hub.spigotmc.org/nexus/content/groups/public" } + maven { url "http://maven.sk89q.com/repo/" } + maven { url "http://repo.maven.apache.org/maven2" } + } + + if (JavaVersion.current().isJava8Compatible()) { + // Java 8 turns on doclint which we fail + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } + } + + task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource + } + + task javadocJar(type: Jar, dependsOn: javadoc) { + classifier = 'javadoc' + from javadoc.destinationDir + } + + artifacts { + archives jar + archives sourcesJar + archives javadocJar + } + + build.dependsOn(checkstyleMain) + build.dependsOn(checkstyleTest) + build.dependsOn(sourcesJar) + build.dependsOn(javadocJar) + + shadowJar { + classifier 'dist' + dependencies { + include(dependency('org.khelekore:prtree:1.5.0')) + } + exclude 'GradleStart**' + exclude '.cache' + exclude 'LICENSE*' + } + + artifactory { + contextUrl = "${artifactory_contextUrl}" + publish { + repository { + repoKey = project.version.contains("SNAPSHOT") ? 'libs-snapshot-local' : 'libs-release-local' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + + } + } + + resolve { + repository { + repoKey = 'repo' + username = "${artifactory_user}" + password = "${artifactory_password}" + maven = true + } + } + } +} diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml new file mode 100644 index 00000000..9627da2b --- /dev/null +++ b/config/checkstyle/checkstyle.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/header.txt b/config/checkstyle/header.txt index 3451a2a9..2ba46c92 100644 --- a/config/checkstyle/header.txt +++ b/config/checkstyle/header.txt @@ -1,5 +1,5 @@ /* - * WorldGuard, a suite of tools for Minecraft + * WorldGuard * Copyright (C) sk89q * Copyright (C) WorldGuard team and contributors * @@ -15,4 +15,4 @@ * * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . - */ \ No newline at end of file + */ diff --git a/config/checkstyle/import-control.xml b/config/checkstyle/import-control.xml index fbeae964..636bbc0f 100644 --- a/config/checkstyle/import-control.xml +++ b/config/checkstyle/import-control.xml @@ -1,22 +1,3 @@ - - @@ -25,17 +6,29 @@ - - + - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..b7612167031001b7b84baf2a959e8ea8ad03c011 GIT binary patch literal 51017 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

N(DARnfPMFG|;(rIGZH1uB1rN;y7UlJ8 znb!RwO#5WS_%cPPlwSw94PTKP64}}J!~E1}ch9``2jvUrB*#@up8L&*`tqgq ztTAS@^33w-5hFZAH&{j)?l0<)9X(d`N|yLk!E=iT%PD-FTJ!|hqyj%RFFP`SaL;|_ z$(+VYhKm)K@Oe~+eZK(6ElQNdfimBrdKjeVl57_7p^|)jrzt|wyRonj$j9Bji!

f)EE4q$t9yObmyG04W0z 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 t|KH7qPwVTc?c*oWQQiM74F8)Y \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..8a0b282a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..4f4305ae --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'worldguard' + +include 'worldguard-core', 'worldguard-sponge', 'worldguard-legacy' diff --git a/worldguard-core/build.gradle b/worldguard-core/build.gradle new file mode 100644 index 00000000..0a0e9f6d --- /dev/null +++ b/worldguard-core/build.gradle @@ -0,0 +1,23 @@ +apply plugin: 'eclipse' +apply plugin: 'idea' + +dependencies { + compile 'com.sk89q.worldedit:worldedit-core:6.1.1-SNAPSHOT' + compile 'com.sk89q.intake:intake:4.2-SNAPSHOT' + compile 'com.sk89q:squirrelid:0.1.0' + compile 'org.flywaydb:flyway-core:3.0' + compile 'org.khelekore:prtree:1.5.0' +} + +sourceSets { + main { + java { + srcDir 'src/main/java' + } + resources { + srcDir 'src/main/resources' + } + } +} + +build.dependsOn(shadowJar) diff --git a/worldguard-core/worldguard-core.iml b/worldguard-core/worldguard-core.iml new file mode 100644 index 00000000..6c1e626f --- /dev/null +++ b/worldguard-core/worldguard-core.iml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/worldguard-legacy/build.gradle b/worldguard-legacy/build.gradle new file mode 100644 index 00000000..8f90c185 --- /dev/null +++ b/worldguard-legacy/build.gradle @@ -0,0 +1,42 @@ +apply plugin: 'eclipse' +apply plugin: 'idea' + +version '6.1.2-SNAPSHOT' + +tasks.withType(Checkstyle) { + exclude '**/**' +} + +dependencies { + compile 'org.khelekore:prtree:1.5.0' + compile 'org.bukkit:bukkit:1.8.8-R0.1-SNAPSHOT' + compile 'com.sk89q.worldedit:worldedit-bukkit:6.1.1-SNAPSHOT' + compile 'com.sk89q:squirrelid:0.1.0' + compile 'com.sk89q:guavabackport:1.1' + compile 'org.flywaydb:flyway-core:3.0' + compile 'com.sk89q:commandbook:2.3' + compile 'net.sf.opencsv:opencsv:2.0' + compile 'com.googlecode.json-simple:json-simple:1.1.1' + compile 'com.google.code.findbugs:jsr305:1.3.9' + testCompile 'junit:junit:4.11' + testCompile 'org.hamcrest:hamcrest-library:1.2.1' +} + +shadowJar { + dependencies { + include(dependency('org.khelekore:prtree:1.5.0')) + include(dependency('com.sk89q:guavabackport:1.1')) + include(dependency('com.sk89q:squirrelid:0.1.0')) + include(dependency('org.flywaydb:flyway-core:3.0')) + include(dependency('com.googlecode.json-simple:json-simple:1.1.1')) + include(dependency('net.sf.opencsv:opencsv:2.0')) + } + + relocate('com.sk89q.guavabackport', 'com.sk89q.worldguard.internal.guava') + relocate('org.flywaydb', 'com.sk89q.worldguard.internal.flywaydb') + relocate('com.sk89q.squirrelid', 'com.sk89q.worldguard.util.profile') + relocate('org.json.simple', 'com.sk89q.worldguard.util.jsonsimple') + +} + +build.dependsOn(shadowJar) diff --git a/config/assembly/default.xml b/worldguard-legacy/config/assembly/default.xml similarity index 100% rename from config/assembly/default.xml rename to worldguard-legacy/config/assembly/default.xml diff --git a/worldguard-legacy/config/checkstyle/header.txt b/worldguard-legacy/config/checkstyle/header.txt new file mode 100644 index 00000000..3451a2a9 --- /dev/null +++ b/worldguard-legacy/config/checkstyle/header.txt @@ -0,0 +1,18 @@ +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ \ No newline at end of file diff --git a/worldguard-legacy/config/checkstyle/import-control.xml b/worldguard-legacy/config/checkstyle/import-control.xml new file mode 100644 index 00000000..fbeae964 --- /dev/null +++ b/worldguard-legacy/config/checkstyle/import-control.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/config/markdown/footer.html b/worldguard-legacy/config/markdown/footer.html similarity index 100% rename from config/markdown/footer.html rename to worldguard-legacy/config/markdown/footer.html diff --git a/config/markdown/header.html b/worldguard-legacy/config/markdown/header.html similarity index 100% rename from config/markdown/header.html rename to worldguard-legacy/config/markdown/header.html diff --git a/contrib/blacklist_table.sql b/worldguard-legacy/contrib/blacklist_table.sql similarity index 100% rename from contrib/blacklist_table.sql rename to worldguard-legacy/contrib/blacklist_table.sql diff --git a/contrib/region_manual_update_20110325.sql b/worldguard-legacy/contrib/region_manual_update_20110325.sql similarity index 100% rename from contrib/region_manual_update_20110325.sql rename to worldguard-legacy/contrib/region_manual_update_20110325.sql diff --git a/src/main/resources/blacklist.txt b/worldguard-legacy/defaults/blacklist.txt similarity index 97% rename from src/main/resources/blacklist.txt rename to worldguard-legacy/defaults/blacklist.txt index 432513d8..8ed6e0de 100644 --- a/src/main/resources/blacklist.txt +++ b/worldguard-legacy/defaults/blacklist.txt @@ -1,65 +1,65 @@ -# -# WorldGuard blacklist -# -# The blacklist lets you block actions, blocks, and items from being used. -# You choose a set of "items to affect" and a list of "actions to perform." -# -############################################################################### -# -# Example to block some ore mining and placement: -# [coalore,goldore,ironore] -# on-break=deny,log,kick -# on-place=deny,tell -# -# Events that you can detect: -# - on-break (when a block of this type is about to be broken) -# - on-destroy-with (the item/block held by the user while destroying) -# - on-place (a block is being placed) -# - on-use (an item like flint and steel or a bucket is being used) -# - on-interact (when a block in used (doors, chests, etc.)) -# - on-drop (an item is being dropped from the player's inventory) -# - on-acquire (an item enters a player's inventory via some method) -# - on-dispense (a dispenser is about to dispense an item) -# -# Actions (for events): -# - deny (deny completely, used blacklist mode) -# - allow (used in whitelist mode) -# - notify (notify admins with the 'worldguard.notify' permission) -# - log (log to console/file/database) -# - tell (tell a player that that's not allowed) -# - kick (kick player) -# - ban (ban player) -# -# Options: -# - ignore-groups (comma-separated list of groups to not affect) -# - ignore-perms (comma-separated list of permissions to not affect - make up -# your very own permissions!) -# - comment (message for yourself that is printed with 'log' and 'notify') -# - message (optional message to show the user instead; %s is the item name) -# -############################################################################### -# -# For more information, see: -# http://wiki.sk89q.com/wiki/WorldGuard/Blacklist -# -############################################################################### -# -# Some examples follow. -# REMEMBER: If a line has # in front, it will be ignored. -# - -# Deny lava buckets -#[lavabucket] -#ignore-perms=my.own.madeup.permission -#ignore-groups=admins,mods -#on-use=deny,tell - -# Deny some ore -#[coalore,goldore,ironore] -#ignore-groups=admins,mods -#on-break=notify,deny,log - -# Some funky data value tests -#[wood:0;>=2] -#ignore-groups=admins,mods +# +# WorldGuard blacklist +# +# The blacklist lets you block actions, blocks, and items from being used. +# You choose a set of "items to affect" and a list of "actions to perform." +# +############################################################################### +# +# Example to block some ore mining and placement: +# [coalore,goldore,ironore] +# on-break=deny,log,kick +# on-place=deny,tell +# +# Events that you can detect: +# - on-break (when a block of this type is about to be broken) +# - on-destroy-with (the item/block held by the user while destroying) +# - on-place (a block is being placed) +# - on-use (an item like flint and steel or a bucket is being used) +# - on-interact (when a block in used (doors, chests, etc.)) +# - on-drop (an item is being dropped from the player's inventory) +# - on-acquire (an item enters a player's inventory via some method) +# - on-dispense (a dispenser is about to dispense an item) +# +# Actions (for events): +# - deny (deny completely, used blacklist mode) +# - allow (used in whitelist mode) +# - notify (notify admins with the 'worldguard.notify' permission) +# - log (log to console/file/database) +# - tell (tell a player that that's not allowed) +# - kick (kick player) +# - ban (ban player) +# +# Options: +# - ignore-groups (comma-separated list of groups to not affect) +# - ignore-perms (comma-separated list of permissions to not affect - make up +# your very own permissions!) +# - comment (message for yourself that is printed with 'log' and 'notify') +# - message (optional message to show the user instead; %s is the item name) +# +############################################################################### +# +# For more information, see: +# http://wiki.sk89q.com/wiki/WorldGuard/Blacklist +# +############################################################################### +# +# Some examples follow. +# REMEMBER: If a line has # in front, it will be ignored. +# + +# Deny lava buckets +#[lavabucket] +#ignore-perms=my.own.madeup.permission +#ignore-groups=admins,mods +#on-use=deny,tell + +# Deny some ore +#[coalore,goldore,ironore] +#ignore-groups=admins,mods +#on-break=notify,deny,log + +# Some funky data value tests +#[wood:0;>=2] +#ignore-groups=admins,mods #on-break=notify,deny,log \ No newline at end of file diff --git a/src/main/resources/config.yml b/worldguard-legacy/defaults/config.yml similarity index 97% rename from src/main/resources/config.yml rename to worldguard-legacy/defaults/config.yml index f5f94db6..4501e6fb 100644 --- a/src/main/resources/config.yml +++ b/worldguard-legacy/defaults/config.yml @@ -1,22 +1,22 @@ -# -# WorldGuard's configuration file -# -# About editing this file: -# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If -# you use an editor like Notepad++ (recommended for Windows users), you -# must configure it to "replace tabs with spaces." In Notepad++, this can -# be changed in Settings > Preferences > Language Menu. -# - Don't get rid of the indents. They are indented so some entries are -# in categories (like "enforce-single-session" is in the "protection" -# category. -# - If you want to check the format of this file before putting it -# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ -# and see if it gives "ERROR:". -# - Lines starting with # are commentsand so they are ignored. -# -# WARNING: -# Remember to check the compatibility spreadsheet for WorldGuard to see -# if any features are currently broken in your version of Bukkit. -# - +# +# WorldGuard's configuration file +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are commentsand so they are ignored. +# +# WARNING: +# Remember to check the compatibility spreadsheet for WorldGuard to see +# if any features are currently broken in your version of Bukkit. +# + # -- This should be automatically replaced by the plugin in-game -- \ No newline at end of file diff --git a/src/main/resources/config_world.yml b/worldguard-legacy/defaults/config_world.yml similarity index 97% rename from src/main/resources/config_world.yml rename to worldguard-legacy/defaults/config_world.yml index 6a6c5a90..db29fa3a 100644 --- a/src/main/resources/config_world.yml +++ b/worldguard-legacy/defaults/config_world.yml @@ -1,21 +1,21 @@ -# -# WorldGuard's configuration file. -# -# This is the a per-world configuration file. It only affects one -# corresponding world. -# -# About editing this file: -# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If -# you use an editor like Notepad++ (recommended for Windows users), you -# must configure it to "replace tabs with spaces." In Notepad++, this can -# be changed in Settings > Preferences > Language Menu. -# - Don't get rid of the indents. They are indented so some entries are -# in categories (like "enforce-single-session" is in the "protection" -# category. -# - If you want to check the format of this file before putting it -# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ -# and see if it gives "ERROR:". -# - Lines starting with # are comments and so they are ignored. -# - +# +# WorldGuard's configuration file. +# +# This is the a per-world configuration file. It only affects one +# corresponding world. +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are comments and so they are ignored. +# + # -- This should be automatically replaced by the plugin in-game -- \ No newline at end of file diff --git a/src/main/resources/migrations/region/mysql/V1__Initial.sql b/worldguard-legacy/defaults/migrations/region/mysql/V1__Initial.sql similarity index 100% rename from src/main/resources/migrations/region/mysql/V1__Initial.sql rename to worldguard-legacy/defaults/migrations/region/mysql/V1__Initial.sql diff --git a/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql b/worldguard-legacy/defaults/migrations/region/mysql/V2__Bug_fix_and_UUID.sql similarity index 100% rename from src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql rename to worldguard-legacy/defaults/migrations/region/mysql/V2__Bug_fix_and_UUID.sql diff --git a/src/main/resources/migrations/region/sqlite/V1__Initial.sql b/worldguard-legacy/defaults/migrations/region/sqlite/V1__Initial.sql similarity index 100% rename from src/main/resources/migrations/region/sqlite/V1__Initial.sql rename to worldguard-legacy/defaults/migrations/region/sqlite/V1__Initial.sql diff --git a/src/main/resources/plugin.yml b/worldguard-legacy/defaults/plugin.yml similarity index 97% rename from src/main/resources/plugin.yml rename to worldguard-legacy/defaults/plugin.yml index 1981a12a..b0aacf55 100644 --- a/src/main/resources/plugin.yml +++ b/worldguard-legacy/defaults/plugin.yml @@ -1,4 +1,4 @@ -name: WorldGuard -main: com.sk89q.worldguard.bukkit.WorldGuardPlugin -version: "${project.version}" -softdepend: [WorldEdit, CommandBook] +name: WorldGuard +main: com.sk89q.worldguard.bukkit.WorldGuardPlugin +version: "${project.version}" +softdepend: [WorldEdit, CommandBook] diff --git a/pom.xml b/worldguard-legacy/pom.xml similarity index 100% rename from pom.xml rename to worldguard-legacy/pom.xml diff --git a/src/main/java/com/sk89q/worldguard/LocalPlayer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/LocalPlayer.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/LocalPlayer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/LocalPlayer.java index 46689110..cf64cd17 100644 --- a/src/main/java/com/sk89q/worldguard/LocalPlayer.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/LocalPlayer.java @@ -1,122 +1,122 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard; - -import com.sk89q.worldedit.Vector; -import com.sk89q.worldguard.domains.Association; -import com.sk89q.worldguard.protection.association.RegionAssociable; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; - -import java.util.List; -import java.util.UUID; - -public abstract class LocalPlayer implements RegionAssociable { - - /** - * Get this player's name. - * - * @return The player's name - */ - public abstract String getName(); - - /** - * Get this player's unique ID. - * - * @return a UUID - */ - public abstract UUID getUniqueId(); - - /** - * Returns true if this player is inside a group. - * - * @param group The group to check - * @return Whether this player is in {@code group} - */ - public abstract boolean hasGroup(String group); - - /** - * Get this player's position. - * - * @return The player's position - */ - public abstract Vector getPosition(); - - /** - * Kick this player. - * - * @param msg The message to kick the player with - */ - public abstract void kick(String msg); - - /** - * Ban this player. - * - * @param msg The message to ban the player with - */ - public abstract void ban(String msg); - - /** - * Send this player a message. - * - * @param msg The message to send to the player - */ - public abstract void printRaw(String msg); - - /** - * Get this player's list of groups. - * - * @return The groups this player is in - */ - public abstract String[] getGroups(); - - /** - * Returns whether this player has permission. - * - * @param perm The permission to check - * @return Whether this player has {@code perm} - */ - public abstract boolean hasPermission(String perm); - - @Override - public Association getAssociation(List regions) { - boolean member = false; - - for (ProtectedRegion region : regions) { - if (region.isOwner(this)) { - return Association.OWNER; - } else if (!member && region.isMember(this)) { - member = true; - } - } - - return member ? Association.MEMBER : Association.NON_MEMBER; - } - - @Override - public boolean equals(Object obj) { - return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName()); - } - - @Override - public int hashCode() { - return getName().hashCode(); - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard; + +import com.sk89q.worldedit.Vector; +import com.sk89q.worldguard.domains.Association; +import com.sk89q.worldguard.protection.association.RegionAssociable; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; + +import java.util.List; +import java.util.UUID; + +public abstract class LocalPlayer implements RegionAssociable { + + /** + * Get this player's name. + * + * @return The player's name + */ + public abstract String getName(); + + /** + * Get this player's unique ID. + * + * @return a UUID + */ + public abstract UUID getUniqueId(); + + /** + * Returns true if this player is inside a group. + * + * @param group The group to check + * @return Whether this player is in {@code group} + */ + public abstract boolean hasGroup(String group); + + /** + * Get this player's position. + * + * @return The player's position + */ + public abstract Vector getPosition(); + + /** + * Kick this player. + * + * @param msg The message to kick the player with + */ + public abstract void kick(String msg); + + /** + * Ban this player. + * + * @param msg The message to ban the player with + */ + public abstract void ban(String msg); + + /** + * Send this player a message. + * + * @param msg The message to send to the player + */ + public abstract void printRaw(String msg); + + /** + * Get this player's list of groups. + * + * @return The groups this player is in + */ + public abstract String[] getGroups(); + + /** + * Returns whether this player has permission. + * + * @param perm The permission to check + * @return Whether this player has {@code perm} + */ + public abstract boolean hasPermission(String perm); + + @Override + public Association getAssociation(List regions) { + boolean member = false; + + for (ProtectedRegion region : regions) { + if (region.isOwner(this)) { + return Association.OWNER; + } else if (!member && region.isMember(this)) { + member = true; + } + } + + return member ? Association.MEMBER : Association.NON_MEMBER; + } + + @Override + public boolean equals(Object obj) { + return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName()); + } + + @Override + public int hashCode() { + return getName().hashCode(); + } + +} diff --git a/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLoggerHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLoggerHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/BlacklistLoggerHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLoggerHandler.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/MatcherIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/MatcherIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/MatcherIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/MatcherIndex.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/TrackedEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/TrackedEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/TrackedEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/TrackedEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/Action.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/Action.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/Action.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/Action.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/ActionResult.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/ActionResult.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/ActionResult.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/ActionResult.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/ActionType.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/ActionType.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/ActionType.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/ActionType.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/AllowAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/AllowAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/AllowAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/AllowAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/BanAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/BanAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/BanAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/BanAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/DenyAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/DenyAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/DenyAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/DenyAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/KickAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/KickAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/KickAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/KickAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/LogAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/LogAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/LogAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/LogAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/NotifyAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/NotifyAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/NotifyAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/NotifyAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/RepeatGuardedAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/RepeatGuardedAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/RepeatGuardedAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/RepeatGuardedAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/action/TellAction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/TellAction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/action/TellAction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/action/TellAction.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/AbstractBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/AbstractBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/AbstractBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/AbstractBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlockBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBreakBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBreakBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlockBreakBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockBreakBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlockDispenseBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockDispenseBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlockDispenseBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockDispenseBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlockInteractBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockInteractBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlockInteractBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockInteractBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/BlockPlaceBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockPlaceBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/BlockPlaceBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/BlockPlaceBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/EventType.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/EventType.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/EventType.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/EventType.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/ItemAcquireBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemAcquireBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/ItemAcquireBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemAcquireBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/ItemBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/ItemBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDestroyWithBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDestroyWithBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/ItemDestroyWithBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDestroyWithBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDropBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDropBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/ItemDropBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemDropBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/event/ItemUseBlacklistEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemUseBlacklistEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/event/ItemUseBlacklistEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/event/ItemUseBlacklistEvent.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/logger/ConsoleHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/ConsoleHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/logger/ConsoleHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/ConsoleHandler.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/logger/LogFileWriter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/LogFileWriter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/logger/LogFileWriter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/LogFileWriter.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/logger/LoggerHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/LoggerHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/logger/LoggerHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/logger/LoggerHandler.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/DataMask.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/DataMask.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/DataMask.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/DataMask.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/DataValueRangeMatcher.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/DataValueRangeMatcher.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/DataValueRangeMatcher.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/DataValueRangeMatcher.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/MaterialTarget.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/MaterialTarget.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/MaterialTarget.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/MaterialTarget.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/RangeMask.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/RangeMask.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/RangeMask.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/RangeMask.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/Target.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/Target.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/Target.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/Target.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcher.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcher.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcher.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcher.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParseException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParseException.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParseException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParseException.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/TargetMatcherParser.java diff --git a/src/main/java/com/sk89q/worldguard/blacklist/target/WildcardDataMatcher.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/WildcardDataMatcher.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/blacklist/target/WildcardDataMatcher.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/blacklist/target/WildcardDataMatcher.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java index 5cefcc50..be32d3d3 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java @@ -1,111 +1,111 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit; - -import org.bukkit.Location; -import org.bukkit.entity.Player; - -import com.sk89q.worldedit.Vector; -import com.sk89q.worldguard.LocalPlayer; - -import java.util.UUID; - -import static com.google.common.base.Preconditions.checkNotNull; - -public class BukkitPlayer extends LocalPlayer { - - private final WorldGuardPlugin plugin; - private final Player player; - private final String name; - private final boolean silenced; - - public BukkitPlayer(WorldGuardPlugin plugin, Player player) { - this(plugin, player, false); - } - - BukkitPlayer(WorldGuardPlugin plugin, Player player, boolean silenced) { - checkNotNull(plugin); - checkNotNull(player); - - this.plugin = plugin; - this.player = player; - // getName() takes longer than before in newer versions of Minecraft - this.name = player.getName(); - this.silenced = silenced; - } - - @Override - public String getName() { - return name; - } - - @Override - public UUID getUniqueId() { - return player.getUniqueId(); - } - - @Override - public boolean hasGroup(String group) { - return plugin.inGroup(player, group); - } - - @Override - public Vector getPosition() { - Location loc = player.getLocation(); - return new Vector(loc.getX(), loc.getY(), loc.getZ()); - } - - @Override - public void kick(String msg) { - if (!silenced) { - player.kickPlayer(msg); - } - } - - @Override - public void ban(String msg) { - if (!silenced) { - player.setBanned(true); - player.kickPlayer(msg); - } - } - - @Override - public String[] getGroups() { - return plugin.getGroups(player); - } - - @Override - public void printRaw(String msg) { - if (!silenced) { - player.sendMessage(msg); - } - } - - @Override - public boolean hasPermission(String perm) { - return plugin.hasPermission(player, perm); - } - - public Player getPlayer() { - return player; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit; + +import org.bukkit.Location; +import org.bukkit.entity.Player; + +import com.sk89q.worldedit.Vector; +import com.sk89q.worldguard.LocalPlayer; + +import java.util.UUID; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class BukkitPlayer extends LocalPlayer { + + private final WorldGuardPlugin plugin; + private final Player player; + private final String name; + private final boolean silenced; + + public BukkitPlayer(WorldGuardPlugin plugin, Player player) { + this(plugin, player, false); + } + + BukkitPlayer(WorldGuardPlugin plugin, Player player, boolean silenced) { + checkNotNull(plugin); + checkNotNull(player); + + this.plugin = plugin; + this.player = player; + // getName() takes longer than before in newer versions of Minecraft + this.name = player.getName(); + this.silenced = silenced; + } + + @Override + public String getName() { + return name; + } + + @Override + public UUID getUniqueId() { + return player.getUniqueId(); + } + + @Override + public boolean hasGroup(String group) { + return plugin.inGroup(player, group); + } + + @Override + public Vector getPosition() { + Location loc = player.getLocation(); + return new Vector(loc.getX(), loc.getY(), loc.getZ()); + } + + @Override + public void kick(String msg) { + if (!silenced) { + player.kickPlayer(msg); + } + } + + @Override + public void ban(String msg) { + if (!silenced) { + player.setBanned(true); + player.kickPlayer(msg); + } + } + + @Override + public String[] getGroups() { + return plugin.getGroups(player); + } + + @Override + public void printRaw(String msg) { + if (!silenced) { + player.sendMessage(msg); + } + } + + @Override + public boolean hasPermission(String perm) { + return plugin.hasPermission(player, perm); + } + + public Player getPlayer() { + return player; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java index 3bbf5f16..8f50a1f1 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java @@ -1,408 +1,408 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit; - -import com.google.common.collect.ImmutableList; -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.Vector; -import com.sk89q.worldedit.blocks.BlockID; -import com.sk89q.worldedit.blocks.BlockType; -import com.sk89q.worldedit.blocks.ItemID; -import com.sk89q.worldguard.blacklist.target.MaterialTarget; -import com.sk89q.worldguard.blacklist.target.Target; -import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.util.Enums; -import org.bukkit.*; -import org.bukkit.block.Block; -import org.bukkit.entity.*; -import org.bukkit.inventory.ItemStack; - -import java.lang.reflect.Method; -import java.util.Collection; -import java.util.List; - -import static com.google.common.base.Preconditions.checkNotNull; - -public class BukkitUtil { - - private static Method ONLINE_PLAYERS_METHOD; - - private BukkitUtil() { - - } - - /** - * Converts the location of a Bukkit block to a WorldEdit vector. - * - * @param block The block to convert - * @return The block's location as a BlockVector - */ - public static BlockVector toVector(Block block) { - return new BlockVector(block.getX(), block.getY(), block.getZ()); - } - - /** - * Converts a Bukkit location to a WorldEdit vector. - * - * @param loc A Bukkit Location - * @return A Vector with the location's x, y, and z values - */ - public static Vector toVector(Location loc) { - return new Vector(loc.getX(), loc.getY(), loc.getZ()); - } - - /** - * Converts a Bukkit vector to a WorldEdit vector. - * - * @param vector The Bukkit vector - * @return A WorldEdit vector with the same values as the Bukkit vector. - */ - public static Vector toVector(org.bukkit.util.Vector vector) { - return new Vector(vector.getX(), vector.getY(), vector.getZ()); - } - - /** - * Converts a WorldEdit vector to a Bukkit location. - * - * @param world The World to create the new Location with - * @param vec The vector to use for coordinates - * @return The Vector as a location with a World of world - */ - public static Location toLocation(World world, Vector vec) { - return new Location(world, vec.getX(), vec.getY(), vec.getZ()); - } - - /** - * Create a dummy region that encompasses the size of a chunk. - * - * @param chunk The chunk - * @return The dummy region - */ - public static ProtectedRegion toRegion(Chunk chunk) { - World world = chunk.getWorld(); - - int minX = chunk.getX() << 4; - int minZ = chunk.getZ() << 4; - return new ProtectedCuboidRegion("_", new BlockVector(minX, 0, minZ), new BlockVector(minX + 15, world.getMaxHeight(), minZ + 15)); - } - - /** - * Matches one player based on name. - * - * @param server The server to check - * @param name The name to attempt to match - * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)} - * @return The matched player if any, otherwise null - */ - @Deprecated - public static Player matchSinglePlayer(Server server, String name) { - List players = server.matchPlayer(name); - if (players.size() == 0) { - return null; - } - return players.get(0); - } - - /** - * Drops a sign item and removes a sign. - * - * @param block The block - * @deprecated see {@link org.bukkit.block.Block#breakNaturally()} - */ - @Deprecated - public static void dropSign(Block block) { - block.setTypeId(0); - block.getWorld().dropItemNaturally(block.getLocation(), - new ItemStack(ItemID.SIGN, 1)); - } - - /** - * Sets the given block to fluid water. - * Used by addSpongeWater() - * - * @param world - * @param ox - * @param oy - * @param oz - */ - public static void setBlockToWater(World world, int ox, int oy, int oz) { - Block block = world.getBlockAt(ox, oy, oz); - int id = block.getTypeId(); - if (id == 0) { - block.setTypeId(8); - } - } - - /** - * Checks if the given block is water - * - * @param world the world - * @param ox x - * @param oy y - * @param oz z - * @return true if it's water - */ - public static boolean isBlockWater(World world, int ox, int oy, int oz) { - Block block = world.getBlockAt(ox, oy, oz); - int id = block.getTypeId(); - return id == 8 || id == 9; - } - - /** - * Checks if the given potion is a vial of water. - * - * @param item the item to check - * @return true if it's a water vial - */ - public static boolean isWaterPotion(ItemStack item) { - return (item.getDurability() & 0x3F) == 0; - } - - /** - * Get just the potion effect bits. This is to work around bugs with potion - * parsing. - * - * @param item item - * @return new bits - */ - public static int getPotionEffectBits(ItemStack item) { - return item.getDurability() & 0x3F; - } - - /** - * Find a position for the player to stand that is not inside a block. - * Blocks above the player will be iteratively tested until there is - * a series of two free blocks. The player will be teleported to - * that free position. - * - * @param player - */ - public static void findFreePosition(Player player) { - Location loc = player.getLocation(); - int x = loc.getBlockX(); - int y = Math.max(0, loc.getBlockY()); - int origY = y; - int z = loc.getBlockZ(); - World world = player.getWorld(); - - byte free = 0; - - while (y <= world.getMaxHeight() + 1) { - if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) { - free++; - } else { - free = 0; - } - - if (free == 2) { - if (y - 1 != origY || y == 1) { - loc.setX(x + 0.5); - loc.setY(y); - loc.setZ(z + 0.5); - if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) { - world.getBlockAt(x,0,z).setTypeId(20); - loc.setY(2); - } - player.setFallDistance(0F); - player.teleport(loc); - } - return; - } - - y++; - } - } - - /** - * Replace color macros in a string. The macros are in the form of `[char] - * where char represents the color. R is for red, Y is for yellow, - * G is for green, C is for cyan, B is for blue, and P is for purple. - * The uppercase versions of those are the darker shades, while the - * lowercase versions are the lighter shades. For white, it's 'w', and - * 0-2 are black, dark grey, and grey, respectively. - * - * @param str - * @return color-coded string - */ - public static String replaceColorMacros(String str) { - str = str.replace("&r", ChatColor.RED.toString()); - str = str.replace("&R", ChatColor.DARK_RED.toString()); - - str = str.replace("&y", ChatColor.YELLOW.toString()); - str = str.replace("&Y", ChatColor.GOLD.toString()); - - str = str.replace("&g", ChatColor.GREEN.toString()); - str = str.replace("&G", ChatColor.DARK_GREEN.toString()); - - str = str.replace("&c", ChatColor.AQUA.toString()); - str = str.replace("&C", ChatColor.DARK_AQUA.toString()); - - str = str.replace("&b", ChatColor.BLUE.toString()); - str = str.replace("&B", ChatColor.DARK_BLUE.toString()); - - str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString()); - str = str.replace("&P", ChatColor.DARK_PURPLE.toString()); - - str = str.replace("&0", ChatColor.BLACK.toString()); - str = str.replace("&1", ChatColor.DARK_GRAY.toString()); - str = str.replace("&2", ChatColor.GRAY.toString()); - str = str.replace("&w", ChatColor.WHITE.toString()); - - str = str.replace("&k", ChatColor.MAGIC.toString()); - str = str.replace("&l", ChatColor.BOLD.toString()); - str = str.replace("&m", ChatColor.STRIKETHROUGH.toString()); - str = str.replace("&n", ChatColor.UNDERLINE.toString()); - str = str.replace("&o", ChatColor.ITALIC.toString()); - - str = str.replace("&x", ChatColor.RESET.toString()); - - return str; - } - - private static final org.bukkit.entity.EntityType armorStandType = - Enums.findByValue(org.bukkit.entity.EntityType.class, "ARMOR_STAND"); - - /** - * Returns whether an entity should be removed for the halt activity mode. - * - * @param entity - * @return true if it's to be removed - */ - public static boolean isIntensiveEntity(Entity entity) { - return entity instanceof Item - || entity instanceof TNTPrimed - || entity instanceof ExperienceOrb - || entity instanceof FallingBlock - || (entity instanceof LivingEntity - && !(entity instanceof Tameable) - && !(entity instanceof Player) - && !(entity.getType() == armorStandType)); - } - - /** - * Search an enum for a value, and return the first one found. Return null if the - * enum entry is not found. - * - * @param enumType enum class - * @param values values to test - * @return a value in the enum or null - * @deprecated use {@link Enums#findByValue(Class, String...)} - */ - @Deprecated - public static > T tryEnum(Class enumType, String ... values) { - for (String val : values) { - try { - return Enum.valueOf(enumType, val); - } catch (IllegalArgumentException e) { - } - } - - return null; - } - - /** - * Get a blacklist target for the given block. - * - * @param block the block - * @return a target - */ - public static Target createTarget(Block block) { - checkNotNull(block); - return new MaterialTarget(block.getTypeId(), block.getData()); - } - - /** - * Get a blacklist target for the given block. - * - * @param block the block - * @param material a fallback material - * @return a target - */ - public static Target createTarget(Block block, Material material) { - checkNotNull(material); - if (block.getType() == material) { - return new MaterialTarget(block.getTypeId(), block.getData()); - } else { - return new MaterialTarget(material.getId(), (short) 0); - } - } - - /** - * Get a blacklist target for the given item. - * - * @param item the item - * @return a target - */ - public static Target createTarget(ItemStack item) { - checkNotNull(item); - return new MaterialTarget(item.getTypeId(), item.getDurability()); - } - - /** - * Get a blacklist target for the given material. - * - * @param material the material - * @return a target - */ - public static Target createTarget(Material material) { - checkNotNull(material); - return new MaterialTarget(material.getId(), (short) 0); - } - - /** - * Get a collection of the currently online players. - * - * @return The online players - */ - @SuppressWarnings("unchecked") - public static Collection getOnlinePlayers() { - try { - return Bukkit.getServer().getOnlinePlayers(); - } catch (NoSuchMethodError ignored) { - } - - try { - if (ONLINE_PLAYERS_METHOD == null) { - ONLINE_PLAYERS_METHOD = getOnlinePlayersMethod(); - } - - Object result = ONLINE_PLAYERS_METHOD.invoke(Bukkit.getServer()); - if (result instanceof Player[]) { - return ImmutableList.copyOf((Player[]) result); - } else if (result instanceof Collection) { - return (Collection) result; - } else { - throw new RuntimeException("Result of getOnlinePlayers() call was not a known data type"); - } - } catch (Exception e) { - throw new RuntimeException("WorldGuard is not compatible with this version of Bukkit", e); - } - } - - private static Method getOnlinePlayersMethod() throws NoSuchMethodException { - try { - return Server.class.getMethod("getOnlinePlayers"); - } catch (NoSuchMethodException e1) { - return Server.class.getMethod("_INVALID_getOnlinePlayers"); - } - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit; + +import com.google.common.collect.ImmutableList; +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldedit.blocks.BlockID; +import com.sk89q.worldedit.blocks.BlockType; +import com.sk89q.worldedit.blocks.ItemID; +import com.sk89q.worldguard.blacklist.target.MaterialTarget; +import com.sk89q.worldguard.blacklist.target.Target; +import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.sk89q.worldguard.util.Enums; +import org.bukkit.*; +import org.bukkit.block.Block; +import org.bukkit.entity.*; +import org.bukkit.inventory.ItemStack; + +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.List; + +import static com.google.common.base.Preconditions.checkNotNull; + +public class BukkitUtil { + + private static Method ONLINE_PLAYERS_METHOD; + + private BukkitUtil() { + + } + + /** + * Converts the location of a Bukkit block to a WorldEdit vector. + * + * @param block The block to convert + * @return The block's location as a BlockVector + */ + public static BlockVector toVector(Block block) { + return new BlockVector(block.getX(), block.getY(), block.getZ()); + } + + /** + * Converts a Bukkit location to a WorldEdit vector. + * + * @param loc A Bukkit Location + * @return A Vector with the location's x, y, and z values + */ + public static Vector toVector(Location loc) { + return new Vector(loc.getX(), loc.getY(), loc.getZ()); + } + + /** + * Converts a Bukkit vector to a WorldEdit vector. + * + * @param vector The Bukkit vector + * @return A WorldEdit vector with the same values as the Bukkit vector. + */ + public static Vector toVector(org.bukkit.util.Vector vector) { + return new Vector(vector.getX(), vector.getY(), vector.getZ()); + } + + /** + * Converts a WorldEdit vector to a Bukkit location. + * + * @param world The World to create the new Location with + * @param vec The vector to use for coordinates + * @return The Vector as a location with a World of world + */ + public static Location toLocation(World world, Vector vec) { + return new Location(world, vec.getX(), vec.getY(), vec.getZ()); + } + + /** + * Create a dummy region that encompasses the size of a chunk. + * + * @param chunk The chunk + * @return The dummy region + */ + public static ProtectedRegion toRegion(Chunk chunk) { + World world = chunk.getWorld(); + + int minX = chunk.getX() << 4; + int minZ = chunk.getZ() << 4; + return new ProtectedCuboidRegion("_", new BlockVector(minX, 0, minZ), new BlockVector(minX + 15, world.getMaxHeight(), minZ + 15)); + } + + /** + * Matches one player based on name. + * + * @param server The server to check + * @param name The name to attempt to match + * @deprecated see {@link WorldGuardPlugin#matchSinglePlayer(org.bukkit.command.CommandSender, String)} + * @return The matched player if any, otherwise null + */ + @Deprecated + public static Player matchSinglePlayer(Server server, String name) { + List players = server.matchPlayer(name); + if (players.size() == 0) { + return null; + } + return players.get(0); + } + + /** + * Drops a sign item and removes a sign. + * + * @param block The block + * @deprecated see {@link org.bukkit.block.Block#breakNaturally()} + */ + @Deprecated + public static void dropSign(Block block) { + block.setTypeId(0); + block.getWorld().dropItemNaturally(block.getLocation(), + new ItemStack(ItemID.SIGN, 1)); + } + + /** + * Sets the given block to fluid water. + * Used by addSpongeWater() + * + * @param world + * @param ox + * @param oy + * @param oz + */ + public static void setBlockToWater(World world, int ox, int oy, int oz) { + Block block = world.getBlockAt(ox, oy, oz); + int id = block.getTypeId(); + if (id == 0) { + block.setTypeId(8); + } + } + + /** + * Checks if the given block is water + * + * @param world the world + * @param ox x + * @param oy y + * @param oz z + * @return true if it's water + */ + public static boolean isBlockWater(World world, int ox, int oy, int oz) { + Block block = world.getBlockAt(ox, oy, oz); + int id = block.getTypeId(); + return id == 8 || id == 9; + } + + /** + * Checks if the given potion is a vial of water. + * + * @param item the item to check + * @return true if it's a water vial + */ + public static boolean isWaterPotion(ItemStack item) { + return (item.getDurability() & 0x3F) == 0; + } + + /** + * Get just the potion effect bits. This is to work around bugs with potion + * parsing. + * + * @param item item + * @return new bits + */ + public static int getPotionEffectBits(ItemStack item) { + return item.getDurability() & 0x3F; + } + + /** + * Find a position for the player to stand that is not inside a block. + * Blocks above the player will be iteratively tested until there is + * a series of two free blocks. The player will be teleported to + * that free position. + * + * @param player + */ + public static void findFreePosition(Player player) { + Location loc = player.getLocation(); + int x = loc.getBlockX(); + int y = Math.max(0, loc.getBlockY()); + int origY = y; + int z = loc.getBlockZ(); + World world = player.getWorld(); + + byte free = 0; + + while (y <= world.getMaxHeight() + 1) { + if (BlockType.canPassThrough(world.getBlockTypeIdAt(x, y, z))) { + free++; + } else { + free = 0; + } + + if (free == 2) { + if (y - 1 != origY || y == 1) { + loc.setX(x + 0.5); + loc.setY(y); + loc.setZ(z + 0.5); + if (y <= 2 && world.getBlockAt(x,0,z).getTypeId() == BlockID.AIR) { + world.getBlockAt(x,0,z).setTypeId(20); + loc.setY(2); + } + player.setFallDistance(0F); + player.teleport(loc); + } + return; + } + + y++; + } + } + + /** + * Replace color macros in a string. The macros are in the form of `[char] + * where char represents the color. R is for red, Y is for yellow, + * G is for green, C is for cyan, B is for blue, and P is for purple. + * The uppercase versions of those are the darker shades, while the + * lowercase versions are the lighter shades. For white, it's 'w', and + * 0-2 are black, dark grey, and grey, respectively. + * + * @param str + * @return color-coded string + */ + public static String replaceColorMacros(String str) { + str = str.replace("&r", ChatColor.RED.toString()); + str = str.replace("&R", ChatColor.DARK_RED.toString()); + + str = str.replace("&y", ChatColor.YELLOW.toString()); + str = str.replace("&Y", ChatColor.GOLD.toString()); + + str = str.replace("&g", ChatColor.GREEN.toString()); + str = str.replace("&G", ChatColor.DARK_GREEN.toString()); + + str = str.replace("&c", ChatColor.AQUA.toString()); + str = str.replace("&C", ChatColor.DARK_AQUA.toString()); + + str = str.replace("&b", ChatColor.BLUE.toString()); + str = str.replace("&B", ChatColor.DARK_BLUE.toString()); + + str = str.replace("&p", ChatColor.LIGHT_PURPLE.toString()); + str = str.replace("&P", ChatColor.DARK_PURPLE.toString()); + + str = str.replace("&0", ChatColor.BLACK.toString()); + str = str.replace("&1", ChatColor.DARK_GRAY.toString()); + str = str.replace("&2", ChatColor.GRAY.toString()); + str = str.replace("&w", ChatColor.WHITE.toString()); + + str = str.replace("&k", ChatColor.MAGIC.toString()); + str = str.replace("&l", ChatColor.BOLD.toString()); + str = str.replace("&m", ChatColor.STRIKETHROUGH.toString()); + str = str.replace("&n", ChatColor.UNDERLINE.toString()); + str = str.replace("&o", ChatColor.ITALIC.toString()); + + str = str.replace("&x", ChatColor.RESET.toString()); + + return str; + } + + private static final org.bukkit.entity.EntityType armorStandType = + Enums.findByValue(org.bukkit.entity.EntityType.class, "ARMOR_STAND"); + + /** + * Returns whether an entity should be removed for the halt activity mode. + * + * @param entity + * @return true if it's to be removed + */ + public static boolean isIntensiveEntity(Entity entity) { + return entity instanceof Item + || entity instanceof TNTPrimed + || entity instanceof ExperienceOrb + || entity instanceof FallingBlock + || (entity instanceof LivingEntity + && !(entity instanceof Tameable) + && !(entity instanceof Player) + && !(entity.getType() == armorStandType)); + } + + /** + * Search an enum for a value, and return the first one found. Return null if the + * enum entry is not found. + * + * @param enumType enum class + * @param values values to test + * @return a value in the enum or null + * @deprecated use {@link Enums#findByValue(Class, String...)} + */ + @Deprecated + public static > T tryEnum(Class enumType, String ... values) { + for (String val : values) { + try { + return Enum.valueOf(enumType, val); + } catch (IllegalArgumentException e) { + } + } + + return null; + } + + /** + * Get a blacklist target for the given block. + * + * @param block the block + * @return a target + */ + public static Target createTarget(Block block) { + checkNotNull(block); + return new MaterialTarget(block.getTypeId(), block.getData()); + } + + /** + * Get a blacklist target for the given block. + * + * @param block the block + * @param material a fallback material + * @return a target + */ + public static Target createTarget(Block block, Material material) { + checkNotNull(material); + if (block.getType() == material) { + return new MaterialTarget(block.getTypeId(), block.getData()); + } else { + return new MaterialTarget(material.getId(), (short) 0); + } + } + + /** + * Get a blacklist target for the given item. + * + * @param item the item + * @return a target + */ + public static Target createTarget(ItemStack item) { + checkNotNull(item); + return new MaterialTarget(item.getTypeId(), item.getDurability()); + } + + /** + * Get a blacklist target for the given material. + * + * @param material the material + * @return a target + */ + public static Target createTarget(Material material) { + checkNotNull(material); + return new MaterialTarget(material.getId(), (short) 0); + } + + /** + * Get a collection of the currently online players. + * + * @return The online players + */ + @SuppressWarnings("unchecked") + public static Collection getOnlinePlayers() { + try { + return Bukkit.getServer().getOnlinePlayers(); + } catch (NoSuchMethodError ignored) { + } + + try { + if (ONLINE_PLAYERS_METHOD == null) { + ONLINE_PLAYERS_METHOD = getOnlinePlayersMethod(); + } + + Object result = ONLINE_PLAYERS_METHOD.invoke(Bukkit.getServer()); + if (result instanceof Player[]) { + return ImmutableList.copyOf((Player[]) result); + } else if (result instanceof Collection) { + return (Collection) result; + } else { + throw new RuntimeException("Result of getOnlinePlayers() call was not a known data type"); + } + } catch (Exception e) { + throw new RuntimeException("WorldGuard is not compatible with this version of Bukkit", e); + } + } + + private static Method getOnlinePlayersMethod() throws NoSuchMethodException { + try { + return Server.class.getMethod("getOnlinePlayers"); + } catch (NoSuchMethodException e1) { + return Server.class.getMethod("_INVALID_getOnlinePlayers"); + } + } + +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/QueryCache.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/QueryCache.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/QueryCache.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/QueryCache.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/RegionContainer.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/RegionQuery.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java index 7b14d4e2..3b0bf4fa 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java @@ -1,1016 +1,1016 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit; - -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Lists; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.common.util.concurrent.MoreExecutors; -import com.sk89q.bukkit.util.CommandsManagerRegistration; -import com.sk89q.minecraft.util.commands.*; -import com.sk89q.squirrelid.cache.HashMapCache; -import com.sk89q.squirrelid.cache.ProfileCache; -import com.sk89q.squirrelid.cache.SQLiteCache; -import com.sk89q.squirrelid.resolver.*; -import com.sk89q.wepif.PermissionsResolverManager; -import com.sk89q.worldedit.bukkit.WorldEditPlugin; -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.bukkit.commands.GeneralCommands; -import com.sk89q.worldguard.bukkit.commands.ProtectionCommands; -import com.sk89q.worldguard.bukkit.commands.ToggleCommands; -import com.sk89q.worldguard.bukkit.event.player.ProcessPlayerEvent; -import com.sk89q.worldguard.bukkit.listener.*; -import com.sk89q.worldguard.bukkit.util.Events; -import com.sk89q.worldguard.protection.GlobalRegionManager; -import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.managers.RegionManager; -import com.sk89q.worldguard.protection.managers.storage.StorageException; -import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.protection.util.UnresolvedNamesException; -import com.sk89q.worldguard.session.SessionManager; -import com.sk89q.worldguard.util.concurrent.EvenMoreExecutors; -import com.sk89q.worldguard.util.logging.ClassSourceValidator; -import com.sk89q.worldguard.util.logging.RecordMessagePrefixer; -import com.sk89q.worldguard.util.task.SimpleSupervisor; -import com.sk89q.worldguard.util.task.Supervisor; -import com.sk89q.worldguard.util.task.Task; -import org.bukkit.ChatColor; -import org.bukkit.Location; -import org.bukkit.OfflinePlayer; -import org.bukkit.World; -import org.bukkit.World.Environment; -import org.bukkit.block.Block; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.command.ConsoleCommandSender; -import org.bukkit.entity.Player; -import org.bukkit.permissions.Permissible; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; - -import javax.annotation.Nullable; -import java.io.*; -import java.util.*; -import java.util.concurrent.CancellationException; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; -import java.util.jar.JarFile; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.zip.ZipEntry; - -/** - * The main class for WorldGuard as a Bukkit plugin. - */ -public class WorldGuardPlugin extends JavaPlugin { - - private static final Logger log = Logger.getLogger(WorldGuardPlugin.class.getCanonicalName()); - - private static WorldGuardPlugin inst; - private final CommandsManager commands; - private final ConfigurationManager configuration = new ConfigurationManager(this); - private final RegionContainer regionContainer = new RegionContainer(this); - private final GlobalRegionManager globalRegionManager = new GlobalRegionManager(this, regionContainer); - private SessionManager sessionManager; - private final Supervisor supervisor = new SimpleSupervisor(); - private ListeningExecutorService executorService; - private ProfileService profileService; - private ProfileCache profileCache; - private PlayerMoveListener playerMoveListener; - - /** - * Construct objects. Actual loading occurs when the plugin is enabled, so - * this merely instantiates the objects. - */ - public WorldGuardPlugin() { - final WorldGuardPlugin plugin = inst = this; - commands = new CommandsManager() { - @Override - public boolean hasPermission(CommandSender player, String perm) { - return plugin.hasPermission(player, perm); - } - }; - } - - /** - * Get the current instance of WorldGuard - * @return WorldGuardPlugin instance - */ - public static WorldGuardPlugin inst() { - return inst; - } - - /** - * Called on plugin enable. - */ - @Override - @SuppressWarnings("deprecation") - public void onEnable() { - configureLogger(); - - getDataFolder().mkdirs(); // Need to create the plugins/WorldGuard folder - - executorService = MoreExecutors.listeningDecorator(EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 20)); - - sessionManager = new SessionManager(this); - - // Set the proper command injector - commands.setInjector(new SimpleInjector(this)); - - // Catch bad things being done by naughty plugins that include - // WorldGuard's classes - ClassSourceValidator verifier = new ClassSourceValidator(this); - verifier.reportMismatches(ImmutableList.of(WGBukkit.class, ProtectedRegion.class, ProtectedCuboidRegion.class, Flag.class)); - - // Register command classes - final CommandsManagerRegistration reg = new CommandsManagerRegistration(this, commands); - reg.register(ToggleCommands.class); - reg.register(ProtectionCommands.class); - - getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() { - @Override - public void run() { - if (!getGlobalStateManager().hasCommandBookGodMode()) { - reg.register(GeneralCommands.class); - } - } - }, 0L); - - File cacheDir = new File(getDataFolder(), "cache"); - cacheDir.mkdirs(); - try { - profileCache = new SQLiteCache(new File(cacheDir, "profiles.sqlite")); - } catch (IOException e) { - log.log(Level.WARNING, "Failed to initialize SQLite profile cache"); - profileCache = new HashMapCache(); - } - - profileService = new CacheForwardingService( - new CombinedProfileService( - BukkitPlayerService.getInstance(), - HttpRepositoryService.forMinecraft()), - profileCache); - - PermissionsResolverManager.initialize(this); - configuration.load(); - - log.info("Loading region data..."); - regionContainer.initialize(); - - getServer().getScheduler().scheduleSyncRepeatingTask(this, sessionManager, SessionManager.RUN_DELAY, SessionManager.RUN_DELAY); - - // Register events - getServer().getPluginManager().registerEvents(sessionManager, this); - (new WorldGuardPlayerListener(this)).registerEvents(); - (new WorldGuardBlockListener(this)).registerEvents(); - (new WorldGuardEntityListener(this)).registerEvents(); - (new WorldGuardWeatherListener(this)).registerEvents(); - (new WorldGuardVehicleListener(this)).registerEvents(); - (new WorldGuardServerListener(this)).registerEvents(); - (new WorldGuardHangingListener(this)).registerEvents(); - - // Modules - (playerMoveListener = new PlayerMoveListener(this)).registerEvents(); - (new BlacklistListener(this)).registerEvents(); - (new ChestProtectionListener(this)).registerEvents(); - (new RegionProtectionListener(this)).registerEvents(); - (new RegionFlagsListener(this)).registerEvents(); - (new WorldRulesListener(this)).registerEvents(); - (new BlockedPotionsListener(this)).registerEvents(); - (new EventAbstractionListener(this)).registerEvents(); - (new PlayerModesListener(this)).registerEvents(); - (new BuildPermissionListener(this)).registerEvents(); - (new InvincibilityListener(this)).registerEvents(); - if ("true".equalsIgnoreCase(System.getProperty("worldguard.debug.listener"))) { - (new DebuggingListener(this, log)).registerEvents(); - } - - configuration.updateCommandBookGodMode(); - - if (getServer().getPluginManager().isPluginEnabled("CommandBook")) { - getServer().getPluginManager().registerEvents(new WorldGuardCommandBookListener(this), this); - } - - // handle worlds separately to initialize already loaded worlds - WorldGuardWorldListener worldListener = (new WorldGuardWorldListener(this)); - for (World world : getServer().getWorlds()) { - worldListener.initWorld(world); - } - worldListener.registerEvents(); - - for (Player player : BukkitUtil.getOnlinePlayers()) { - ProcessPlayerEvent event = new ProcessPlayerEvent(player); - Events.fire(event); - } - } - - @Override - public void onDisable() { - executorService.shutdown(); - - try { - log.log(Level.INFO, "Shutting down executor and waiting for any pending tasks..."); - - List> tasks = supervisor.getTasks(); - if (!tasks.isEmpty()) { - StringBuilder builder = new StringBuilder("Known tasks:"); - for (Task task : tasks) { - builder.append("\n"); - builder.append(task.getName()); - } - log.log(Level.INFO, builder.toString()); - } - - Futures.successfulAsList(tasks).get(); - executorService.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } catch (ExecutionException e) { - log.log(Level.WARNING, "Some tasks failed while waiting for remaining tasks to finish", e); - } - - regionContainer.unload(); - configuration.unload(); - this.getServer().getScheduler().cancelTasks(this); - } - - @Override - public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { - try { - commands.execute(cmd.getName(), args, sender, sender); - } catch (CommandPermissionsException e) { - sender.sendMessage(ChatColor.RED + "You don't have permission."); - } catch (MissingNestedCommandException e) { - sender.sendMessage(ChatColor.RED + e.getUsage()); - } catch (CommandUsageException e) { - sender.sendMessage(ChatColor.RED + e.getMessage()); - sender.sendMessage(ChatColor.RED + e.getUsage()); - } catch (WrappedCommandException e) { - sender.sendMessage(ChatColor.RED + convertThrowable(e.getCause())); - } catch (CommandException e) { - sender.sendMessage(ChatColor.RED + e.getMessage()); - } - - return true; - } - - /** - * Convert the throwable into a somewhat friendly message. - * - * @param throwable the throwable - * @return a message - */ - public String convertThrowable(@Nullable Throwable throwable) { - if (throwable instanceof NumberFormatException) { - return "Number expected, string received instead."; - } else if (throwable instanceof StorageException) { - log.log(Level.WARNING, "Error loading/saving regions", throwable); - return "Region data could not be loaded/saved: " + throwable.getMessage(); - } else if (throwable instanceof RejectedExecutionException) { - return "There are currently too many tasks queued to add yours. Use /wg running to list queued and running tasks."; - } else if (throwable instanceof CancellationException) { - return "WorldGuard: Task was cancelled"; - } else if (throwable instanceof InterruptedException) { - return "WorldGuard: Task was interrupted"; - } else if (throwable instanceof UnresolvedNamesException) { - return throwable.getMessage(); - } else if (throwable instanceof CommandException) { - return throwable.getMessage(); - } else { - log.log(Level.WARNING, "WorldGuard encountered an unexpected error", throwable); - return "WorldGuard: An unexpected error occurred! Please see the server console."; - } - } - - /** - * Get the GlobalRegionManager. - * - * @return the plugin's global region manager - * @deprecated use {@link #getRegionContainer()} - */ - @Deprecated - public GlobalRegionManager getGlobalRegionManager() { - return globalRegionManager; - } - - /** - * Get the object that manages region data. - * - * @return the region container - */ - public RegionContainer getRegionContainer() { - return regionContainer; - } - - /** - * Get the WorldGuard Configuration. - * - * @return ConfigurationManager - * @deprecated Use {@link #getGlobalStateManager()} instead - */ - @Deprecated - public ConfigurationManager getGlobalConfiguration() { - return getGlobalStateManager(); - } - - /** - * Gets the flag state manager. - * - * @return The flag state manager - */ - public SessionManager getSessionManager() { - return sessionManager; - } - - /** - * Get the global ConfigurationManager. - * USe this to access global configuration values and per-world configuration values. - * @return The global ConfigurationManager - */ - public ConfigurationManager getGlobalStateManager() { - return configuration; - } - - /** - * Get the supervisor. - * - * @return the supervisor - */ - public Supervisor getSupervisor() { - return supervisor; - } - - /** - * Get the global executor service for internal usage (please use your - * own executor service). - * - * @return the global executor service - */ - public ListeningExecutorService getExecutorService() { - return executorService; - } - - /** - * Get the profile lookup service. - * - * @return the profile lookup service - */ - public ProfileService getProfileService() { - return profileService; - } - - /** - * Get the profile cache. - * - * @return the profile cache - */ - public ProfileCache getProfileCache() { - return profileCache; - } - - /** - * Check whether a player is in a group. - * This calls the corresponding method in PermissionsResolverManager - * - * @param player The player to check - * @param group The group - * @return whether {@code player} is in {@code group} - */ - public boolean inGroup(Player player, String group) { - try { - return PermissionsResolverManager.getInstance().inGroup(player, group); - } catch (Throwable t) { - t.printStackTrace(); - return false; - } - } - - /** - * Get the groups of a player. - * This calls the corresponding method in PermissionsResolverManager. - * @param player The player to check - * @return The names of each group the playe is in. - */ - public String[] getGroups(Player player) { - try { - return PermissionsResolverManager.getInstance().getGroups(player); - } catch (Throwable t) { - t.printStackTrace(); - return new String[0]; - } - } - - /** - * Gets the name of a command sender. This is a unique name and this - * method should never return a "display name". - * - * @param sender The sender to get the name of - * @return The unique name of the sender. - */ - public String toUniqueName(CommandSender sender) { - if (sender instanceof ConsoleCommandSender) { - return "*Console*"; - } else { - return sender.getName(); - } - } - - /** - * Gets the name of a command sender. This play be a display name. - * - * @param sender The CommandSender to get the name of. - * @return The name of the given sender - */ - public String toName(CommandSender sender) { - if (sender instanceof ConsoleCommandSender) { - return "*Console*"; - } else if (sender instanceof Player) { - return ((Player) sender).getDisplayName(); - } else { - return sender.getName(); - } - } - - /** - * Checks permissions. - * - * @param sender The sender to check the permission on. - * @param perm The permission to check the permission on. - * @return whether {@code sender} has {@code perm} - */ - public boolean hasPermission(CommandSender sender, String perm) { - if (sender.isOp()) { - if (sender instanceof Player) { - if (this.getGlobalStateManager().get(((Player) sender). - getWorld()).opPermissions) { - return true; - } - } else { - return true; - } - } - - // Invoke the permissions resolver - if (sender instanceof Player) { - Player player = (Player) sender; - return PermissionsResolverManager.getInstance().hasPermission(player.getWorld().getName(), player, perm); - } - - return false; - } - - /** - * Checks permissions and throws an exception if permission is not met. - * - * @param sender The sender to check the permission on. - * @param perm The permission to check the permission on. - * @throws CommandPermissionsException if {@code sender} doesn't have {@code perm} - */ - public void checkPermission(CommandSender sender, String perm) - throws CommandPermissionsException { - if (!hasPermission(sender, perm)) { - throw new CommandPermissionsException(); - } - } - - /** - * Checks to see if the sender is a player, otherwise throw an exception. - * - * @param sender The {@link CommandSender} to check - * @return {@code sender} casted to a player - * @throws CommandException if {@code sender} isn't a {@link Player} - */ - public Player checkPlayer(CommandSender sender) - throws CommandException { - if (sender instanceof Player) { - return (Player) sender; - } else { - throw new CommandException("A player is expected."); - } - } - - /** - * Match player names. - * - * The filter string uses the following format: - * @[name] looks up all players with the exact {@code name} - * *[name] matches any player whose name contains {@code name} - * [name] matches any player whose name starts with {@code name} - * - * @param filter The filter string to check. - * @return A {@link List} of players who match {@code filter} - */ - public List matchPlayerNames(String filter) { - Collection players = BukkitUtil.getOnlinePlayers(); - - filter = filter.toLowerCase(); - - // Allow exact name matching - if (filter.charAt(0) == '@' && filter.length() >= 2) { - filter = filter.substring(1); - - for (Player player : players) { - if (player.getName().equalsIgnoreCase(filter)) { - List list = new ArrayList(); - list.add(player); - return list; - } - } - - return new ArrayList(); - // Allow partial name matching - } else if (filter.charAt(0) == '*' && filter.length() >= 2) { - filter = filter.substring(1); - - List list = new ArrayList(); - - for (Player player : players) { - if (player.getName().toLowerCase().contains(filter)) { - list.add(player); - } - } - - return list; - - // Start with name matching - } else { - List list = new ArrayList(); - - for (Player player : players) { - if (player.getName().toLowerCase().startsWith(filter)) { - list.add(player); - } - } - - return list; - } - } - - /** - * Checks if the given list of players is greater than size 0, otherwise - * throw an exception. - * - * @param players The {@link List} to check - * @return {@code players} as an {@link Iterable} - * @throws CommandException If {@code players} is empty - */ - protected Iterable checkPlayerMatch(List players) - throws CommandException { - // Check to see if there were any matches - if (players.size() == 0) { - throw new CommandException("No players matched query."); - } - - return players; - } - - /** - * Matches players based on the specified filter string - * - * The filter string format is as follows: - * * returns all the players currently online - * If {@code sender} is a {@link Player}: - * #world returns all players in the world that {@code sender} is in - * #near reaturns all players within 30 blocks of {@code sender}'s location - * Otherwise, the format is as specified in {@link #matchPlayerNames(String)} - * - * @param source The CommandSender who is trying to find a player - * @param filter The filter string for players - * @return iterator for players - * @throws CommandException if no matches are found - */ - public Iterable matchPlayers(CommandSender source, String filter) - throws CommandException { - - if (BukkitUtil.getOnlinePlayers().isEmpty()) { - throw new CommandException("No players matched query."); - } - - if (filter.equals("*")) { - return checkPlayerMatch(Lists.newArrayList(BukkitUtil.getOnlinePlayers())); - } - - // Handle special hash tag groups - if (filter.charAt(0) == '#') { - // Handle #world, which matches player of the same world as the - // calling source - if (filter.equalsIgnoreCase("#world")) { - List players = new ArrayList(); - Player sourcePlayer = checkPlayer(source); - World sourceWorld = sourcePlayer.getWorld(); - - for (Player player : BukkitUtil.getOnlinePlayers()) { - if (player.getWorld().equals(sourceWorld)) { - players.add(player); - } - } - - return checkPlayerMatch(players); - - // Handle #near, which is for nearby players. - } else if (filter.equalsIgnoreCase("#near")) { - List players = new ArrayList(); - Player sourcePlayer = checkPlayer(source); - World sourceWorld = sourcePlayer.getWorld(); - org.bukkit.util.Vector sourceVector - = sourcePlayer.getLocation().toVector(); - - for (Player player : BukkitUtil.getOnlinePlayers()) { - if (player.getWorld().equals(sourceWorld) - && player.getLocation().toVector().distanceSquared( - sourceVector) < 900) { - players.add(player); - } - } - - return checkPlayerMatch(players); - - } else { - throw new CommandException("Invalid group '" + filter + "'."); - } - } - - List players = matchPlayerNames(filter); - - return checkPlayerMatch(players); - } - - /** - * Match only a single player. - * - * @param sender The {@link CommandSender} who is requesting a player match - * @param filter The filter string. - * @see #matchPlayers(org.bukkit.entity.Player) for filter string syntax - * @return The single player - * @throws CommandException If more than one player match was found - */ - public Player matchSinglePlayer(CommandSender sender, String filter) - throws CommandException { - // This will throw an exception if there are no matches - Iterator players = matchPlayers(sender, filter).iterator(); - - Player match = players.next(); - - // We don't want to match the wrong person, so fail if if multiple - // players were found (we don't want to just pick off the first one, - // as that may be the wrong player) - if (players.hasNext()) { - throw new CommandException("More than one player found! " + - "Use @ for exact matching."); - } - - return match; - } - - /** - * Match only a single player or console. - * - * The filter string syntax is as follows: - * #console, *console, or ! return the server console - * All syntax from {@link #matchSinglePlayer(org.bukkit.command.CommandSender, String)} - * @param sender The sender trying to match a CommandSender - * @param filter The filter string - * @return The resulting CommandSender - * @throws CommandException if either zero or more than one player matched. - */ - public CommandSender matchPlayerOrConsole(CommandSender sender, String filter) - throws CommandException { - - // Let's see if console is wanted - if (filter.equalsIgnoreCase("#console") - || filter.equalsIgnoreCase("*console*") - || filter.equalsIgnoreCase("!")) { - return getServer().getConsoleSender(); - } - - return matchSinglePlayer(sender, filter); - } - - /** - * Get a single player as an iterator for players. - * - * @param player The player to return in an Iterable - * @return iterator for player - */ - public Iterable matchPlayers(Player player) { - return Arrays.asList(player); - } - - /** - * Match a world. - * - * The filter string syntax is as follows: - * #main returns the main world - * #normal returns the first world with a normal environment - * #nether return the first world with a nether environment - * #player:[name] returns the world that a player named {@code name} is located in, if the player is online. - * [name] A world with the name {@code name} - * - * @param sender The sender requesting a match - * @param filter The filter string - * @return The resulting world - * @throws CommandException if no world matches - */ - public World matchWorld(CommandSender sender, String filter) throws CommandException { - List worlds = getServer().getWorlds(); - - // Handle special hash tag groups - if (filter.charAt(0) == '#') { - // #main for the main world - if (filter.equalsIgnoreCase("#main")) { - return worlds.get(0); - - // #normal for the first normal world - } else if (filter.equalsIgnoreCase("#normal")) { - for (World world : worlds) { - if (world.getEnvironment() == Environment.NORMAL) { - return world; - } - } - - throw new CommandException("No normal world found."); - - // #nether for the first nether world - } else if (filter.equalsIgnoreCase("#nether")) { - for (World world : worlds) { - if (world.getEnvironment() == Environment.NETHER) { - return world; - } - } - - throw new CommandException("No nether world found."); - - // Handle getting a world from a player - } else if (filter.matches("^#player$")) { - String parts[] = filter.split(":", 2); - - // They didn't specify an argument for the player! - if (parts.length == 1) { - throw new CommandException("Argument expected for #player."); - } - - return matchPlayers(sender, parts[1]).iterator().next().getWorld(); - } else { - throw new CommandException("Invalid identifier '" + filter + "'."); - } - } - - for (World world : worlds) { - if (world.getName().equals(filter)) { - return world; - } - } - - throw new CommandException("No world by that exact name found."); - } - - /** - * Gets a copy of the WorldEdit plugin. - * - * @return The WorldEditPlugin instance - * @throws CommandException If there is no WorldEditPlugin available - */ - public WorldEditPlugin getWorldEdit() throws CommandException { - Plugin worldEdit = getServer().getPluginManager().getPlugin("WorldEdit"); - if (worldEdit == null) { - throw new CommandException("WorldEdit does not appear to be installed."); - } - - if (worldEdit instanceof WorldEditPlugin) { - return (WorldEditPlugin) worldEdit; - } else { - throw new CommandException("WorldEdit detection failed (report error)."); - } - } - - /** - * Wrap a player as a LocalPlayer. - * - * @param player The player to wrap - * @return The wrapped player - */ - public LocalPlayer wrapPlayer(Player player) { - return new BukkitPlayer(this, player); - } - - /** - * Wrap a player as a LocalPlayer. - * - * @param player The player to wrap - * @param silenced True to silence messages - * @return The wrapped player - */ - public LocalPlayer wrapPlayer(Player player, boolean silenced) { - return new BukkitPlayer(this, player, silenced); - } - - /** - * Wrap a player as a LocalPlayer. - * - *

This implementation is incomplete -- permissions cannot be checked.

- * - * @param player The player to wrap - * @return The wrapped player - */ - public LocalPlayer wrapOfflinePlayer(OfflinePlayer player) { - return new BukkitOfflinePlayer(player); - } - - /** - * Return a protection query helper object that can be used by another - * plugin to test whether WorldGuard permits an action at a particular - * place. - * - * @return an instance - */ - public ProtectionQuery createProtectionQuery() { - return new ProtectionQuery(); - } - - /** - * Configure WorldGuard's loggers. - */ - private void configureLogger() { - RecordMessagePrefixer.register(Logger.getLogger("com.sk89q.worldguard"), "[WorldGuard] "); - } - - /** - * Create a default configuration file from the .jar. - * - * @param actual The destination file - * @param defaultName The name of the file inside the jar's defaults folder - */ - public void createDefaultConfiguration(File actual, - String defaultName) { - - // Make parent directories - File parent = actual.getParentFile(); - if (!parent.exists()) { - parent.mkdirs(); - } - - if (actual.exists()) { - return; - } - - InputStream input = - null; - try { - JarFile file = new JarFile(getFile()); - ZipEntry copy = file.getEntry("defaults/" + defaultName); - if (copy == null) throw new FileNotFoundException(); - input = file.getInputStream(copy); - } catch (IOException e) { - log.severe("Unable to read default configuration: " + defaultName); - } - - if (input != null) { - FileOutputStream output = null; - - try { - output = new FileOutputStream(actual); - byte[] buf = new byte[8192]; - int length = 0; - while ((length = input.read(buf)) > 0) { - output.write(buf, 0, length); - } - - log.info("Default configuration file written: " - + actual.getAbsolutePath()); - } catch (IOException e) { - e.printStackTrace(); - } finally { - try { - if (input != null) { - input.close(); - } - } catch (IOException ignore) { - } - - try { - if (output != null) { - output.close(); - } - } catch (IOException ignore) { - } - } - } - } - - /** - * Notifies all with the worldguard.notify permission. - * This will check both superperms and WEPIF, - * but makes sure WEPIF checks don't result in duplicate notifications - * - * @param msg The notification to broadcast - */ - public void broadcastNotification(String msg) { - getServer().broadcast(msg, "worldguard.notify"); - Set subs = getServer().getPluginManager().getPermissionSubscriptions("worldguard.notify"); - for (Player player : BukkitUtil.getOnlinePlayers()) { - if (!(subs.contains(player) && player.hasPermission("worldguard.notify")) && - hasPermission(player, "worldguard.notify")) { // Make sure the player wasn't already broadcasted to. - player.sendMessage(msg); - } - } - log.info(msg); - } - - /** - * Checks to see if a player can build at a location. This will return - * true if region protection is disabled. - * - * @param player The player to check. - * @param loc The location to check at. - * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.Location) - * @return whether {@code player} can build at {@code loc} - */ - public boolean canBuild(Player player, Location loc) { - return getGlobalRegionManager().canBuild(player, loc); - } - - /** - * Checks to see if a player can build at a location. This will return - * true if region protection is disabled. - * - * @param player The player to check - * @param block The block to check at. - * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.block.Block) - * @return whether {@code player} can build at {@code block}'s location - */ - public boolean canBuild(Player player, Block block) { - return getGlobalRegionManager().canBuild(player, block); - } - - /** - * Gets the region manager for a world. - * - * @param world world to get the region manager for - * @return the region manager or null if regions are not enabled - */ - public RegionManager getRegionManager(World world) { - if (!getGlobalStateManager().get(world).useRegions) { - return null; - } - - return getGlobalRegionManager().get(world); - } - - public PlayerMoveListener getPlayerMoveListener() { - return playerMoveListener; - } - - /** - * Replace macros in the text. - * - * The macros replaced are as follows: - * %name%: The name of {@code sender}. See {@link #toName(org.bukkit.command.CommandSender)} - * %id%: The unique name of the sender. See {@link #toUniqueName(org.bukkit.command.CommandSender)} - * %online%: The number of players currently online on the server - * If {@code sender} is a Player: - * %world%: The name of the world {@code sender} is located in - * %health%: The health of {@code sender}. See {@link org.bukkit.entity.Player#getHealth()} - * - * @param sender The sender to check - * @param message The message to replace macros in - * @return The message with macros replaced - */ - public String replaceMacros(CommandSender sender, String message) { - Collection online = BukkitUtil.getOnlinePlayers(); - - message = message.replace("%name%", toName(sender)); - message = message.replace("%id%", toUniqueName(sender)); - message = message.replace("%online%", String.valueOf(online.size())); - - if (sender instanceof Player) { - Player player = (Player) sender; - World world = player.getWorld(); - - message = message.replace("%world%", world.getName()); - message = message.replace("%health%", String.valueOf(player.getHealth())); - } - - return message; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListeningExecutorService; +import com.google.common.util.concurrent.MoreExecutors; +import com.sk89q.bukkit.util.CommandsManagerRegistration; +import com.sk89q.minecraft.util.commands.*; +import com.sk89q.squirrelid.cache.HashMapCache; +import com.sk89q.squirrelid.cache.ProfileCache; +import com.sk89q.squirrelid.cache.SQLiteCache; +import com.sk89q.squirrelid.resolver.*; +import com.sk89q.wepif.PermissionsResolverManager; +import com.sk89q.worldedit.bukkit.WorldEditPlugin; +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.bukkit.commands.GeneralCommands; +import com.sk89q.worldguard.bukkit.commands.ProtectionCommands; +import com.sk89q.worldguard.bukkit.commands.ToggleCommands; +import com.sk89q.worldguard.bukkit.event.player.ProcessPlayerEvent; +import com.sk89q.worldguard.bukkit.listener.*; +import com.sk89q.worldguard.bukkit.util.Events; +import com.sk89q.worldguard.protection.GlobalRegionManager; +import com.sk89q.worldguard.protection.flags.Flag; +import com.sk89q.worldguard.protection.managers.RegionManager; +import com.sk89q.worldguard.protection.managers.storage.StorageException; +import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.sk89q.worldguard.protection.util.UnresolvedNamesException; +import com.sk89q.worldguard.session.SessionManager; +import com.sk89q.worldguard.util.concurrent.EvenMoreExecutors; +import com.sk89q.worldguard.util.logging.ClassSourceValidator; +import com.sk89q.worldguard.util.logging.RecordMessagePrefixer; +import com.sk89q.worldguard.util.task.SimpleSupervisor; +import com.sk89q.worldguard.util.task.Supervisor; +import com.sk89q.worldguard.util.task.Task; +import org.bukkit.ChatColor; +import org.bukkit.Location; +import org.bukkit.OfflinePlayer; +import org.bukkit.World; +import org.bukkit.World.Environment; +import org.bukkit.block.Block; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.command.ConsoleCommandSender; +import org.bukkit.entity.Player; +import org.bukkit.permissions.Permissible; +import org.bukkit.plugin.Plugin; +import org.bukkit.plugin.java.JavaPlugin; + +import javax.annotation.Nullable; +import java.io.*; +import java.util.*; +import java.util.concurrent.CancellationException; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; +import java.util.jar.JarFile; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.zip.ZipEntry; + +/** + * The main class for WorldGuard as a Bukkit plugin. + */ +public class WorldGuardPlugin extends JavaPlugin { + + private static final Logger log = Logger.getLogger(WorldGuardPlugin.class.getCanonicalName()); + + private static WorldGuardPlugin inst; + private final CommandsManager commands; + private final ConfigurationManager configuration = new ConfigurationManager(this); + private final RegionContainer regionContainer = new RegionContainer(this); + private final GlobalRegionManager globalRegionManager = new GlobalRegionManager(this, regionContainer); + private SessionManager sessionManager; + private final Supervisor supervisor = new SimpleSupervisor(); + private ListeningExecutorService executorService; + private ProfileService profileService; + private ProfileCache profileCache; + private PlayerMoveListener playerMoveListener; + + /** + * Construct objects. Actual loading occurs when the plugin is enabled, so + * this merely instantiates the objects. + */ + public WorldGuardPlugin() { + final WorldGuardPlugin plugin = inst = this; + commands = new CommandsManager() { + @Override + public boolean hasPermission(CommandSender player, String perm) { + return plugin.hasPermission(player, perm); + } + }; + } + + /** + * Get the current instance of WorldGuard + * @return WorldGuardPlugin instance + */ + public static WorldGuardPlugin inst() { + return inst; + } + + /** + * Called on plugin enable. + */ + @Override + @SuppressWarnings("deprecation") + public void onEnable() { + configureLogger(); + + getDataFolder().mkdirs(); // Need to create the plugins/WorldGuard folder + + executorService = MoreExecutors.listeningDecorator(EvenMoreExecutors.newBoundedCachedThreadPool(0, 1, 20)); + + sessionManager = new SessionManager(this); + + // Set the proper command injector + commands.setInjector(new SimpleInjector(this)); + + // Catch bad things being done by naughty plugins that include + // WorldGuard's classes + ClassSourceValidator verifier = new ClassSourceValidator(this); + verifier.reportMismatches(ImmutableList.of(WGBukkit.class, ProtectedRegion.class, ProtectedCuboidRegion.class, Flag.class)); + + // Register command classes + final CommandsManagerRegistration reg = new CommandsManagerRegistration(this, commands); + reg.register(ToggleCommands.class); + reg.register(ProtectionCommands.class); + + getServer().getScheduler().scheduleSyncDelayedTask(this, new Runnable() { + @Override + public void run() { + if (!getGlobalStateManager().hasCommandBookGodMode()) { + reg.register(GeneralCommands.class); + } + } + }, 0L); + + File cacheDir = new File(getDataFolder(), "cache"); + cacheDir.mkdirs(); + try { + profileCache = new SQLiteCache(new File(cacheDir, "profiles.sqlite")); + } catch (IOException e) { + log.log(Level.WARNING, "Failed to initialize SQLite profile cache"); + profileCache = new HashMapCache(); + } + + profileService = new CacheForwardingService( + new CombinedProfileService( + BukkitPlayerService.getInstance(), + HttpRepositoryService.forMinecraft()), + profileCache); + + PermissionsResolverManager.initialize(this); + configuration.load(); + + log.info("Loading region data..."); + regionContainer.initialize(); + + getServer().getScheduler().scheduleSyncRepeatingTask(this, sessionManager, SessionManager.RUN_DELAY, SessionManager.RUN_DELAY); + + // Register events + getServer().getPluginManager().registerEvents(sessionManager, this); + (new WorldGuardPlayerListener(this)).registerEvents(); + (new WorldGuardBlockListener(this)).registerEvents(); + (new WorldGuardEntityListener(this)).registerEvents(); + (new WorldGuardWeatherListener(this)).registerEvents(); + (new WorldGuardVehicleListener(this)).registerEvents(); + (new WorldGuardServerListener(this)).registerEvents(); + (new WorldGuardHangingListener(this)).registerEvents(); + + // Modules + (playerMoveListener = new PlayerMoveListener(this)).registerEvents(); + (new BlacklistListener(this)).registerEvents(); + (new ChestProtectionListener(this)).registerEvents(); + (new RegionProtectionListener(this)).registerEvents(); + (new RegionFlagsListener(this)).registerEvents(); + (new WorldRulesListener(this)).registerEvents(); + (new BlockedPotionsListener(this)).registerEvents(); + (new EventAbstractionListener(this)).registerEvents(); + (new PlayerModesListener(this)).registerEvents(); + (new BuildPermissionListener(this)).registerEvents(); + (new InvincibilityListener(this)).registerEvents(); + if ("true".equalsIgnoreCase(System.getProperty("worldguard.debug.listener"))) { + (new DebuggingListener(this, log)).registerEvents(); + } + + configuration.updateCommandBookGodMode(); + + if (getServer().getPluginManager().isPluginEnabled("CommandBook")) { + getServer().getPluginManager().registerEvents(new WorldGuardCommandBookListener(this), this); + } + + // handle worlds separately to initialize already loaded worlds + WorldGuardWorldListener worldListener = (new WorldGuardWorldListener(this)); + for (World world : getServer().getWorlds()) { + worldListener.initWorld(world); + } + worldListener.registerEvents(); + + for (Player player : BukkitUtil.getOnlinePlayers()) { + ProcessPlayerEvent event = new ProcessPlayerEvent(player); + Events.fire(event); + } + } + + @Override + public void onDisable() { + executorService.shutdown(); + + try { + log.log(Level.INFO, "Shutting down executor and waiting for any pending tasks..."); + + List> tasks = supervisor.getTasks(); + if (!tasks.isEmpty()) { + StringBuilder builder = new StringBuilder("Known tasks:"); + for (Task task : tasks) { + builder.append("\n"); + builder.append(task.getName()); + } + log.log(Level.INFO, builder.toString()); + } + + Futures.successfulAsList(tasks).get(); + executorService.awaitTermination(Integer.MAX_VALUE, TimeUnit.DAYS); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } catch (ExecutionException e) { + log.log(Level.WARNING, "Some tasks failed while waiting for remaining tasks to finish", e); + } + + regionContainer.unload(); + configuration.unload(); + this.getServer().getScheduler().cancelTasks(this); + } + + @Override + public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { + try { + commands.execute(cmd.getName(), args, sender, sender); + } catch (CommandPermissionsException e) { + sender.sendMessage(ChatColor.RED + "You don't have permission."); + } catch (MissingNestedCommandException e) { + sender.sendMessage(ChatColor.RED + e.getUsage()); + } catch (CommandUsageException e) { + sender.sendMessage(ChatColor.RED + e.getMessage()); + sender.sendMessage(ChatColor.RED + e.getUsage()); + } catch (WrappedCommandException e) { + sender.sendMessage(ChatColor.RED + convertThrowable(e.getCause())); + } catch (CommandException e) { + sender.sendMessage(ChatColor.RED + e.getMessage()); + } + + return true; + } + + /** + * Convert the throwable into a somewhat friendly message. + * + * @param throwable the throwable + * @return a message + */ + public String convertThrowable(@Nullable Throwable throwable) { + if (throwable instanceof NumberFormatException) { + return "Number expected, string received instead."; + } else if (throwable instanceof StorageException) { + log.log(Level.WARNING, "Error loading/saving regions", throwable); + return "Region data could not be loaded/saved: " + throwable.getMessage(); + } else if (throwable instanceof RejectedExecutionException) { + return "There are currently too many tasks queued to add yours. Use /wg running to list queued and running tasks."; + } else if (throwable instanceof CancellationException) { + return "WorldGuard: Task was cancelled"; + } else if (throwable instanceof InterruptedException) { + return "WorldGuard: Task was interrupted"; + } else if (throwable instanceof UnresolvedNamesException) { + return throwable.getMessage(); + } else if (throwable instanceof CommandException) { + return throwable.getMessage(); + } else { + log.log(Level.WARNING, "WorldGuard encountered an unexpected error", throwable); + return "WorldGuard: An unexpected error occurred! Please see the server console."; + } + } + + /** + * Get the GlobalRegionManager. + * + * @return the plugin's global region manager + * @deprecated use {@link #getRegionContainer()} + */ + @Deprecated + public GlobalRegionManager getGlobalRegionManager() { + return globalRegionManager; + } + + /** + * Get the object that manages region data. + * + * @return the region container + */ + public RegionContainer getRegionContainer() { + return regionContainer; + } + + /** + * Get the WorldGuard Configuration. + * + * @return ConfigurationManager + * @deprecated Use {@link #getGlobalStateManager()} instead + */ + @Deprecated + public ConfigurationManager getGlobalConfiguration() { + return getGlobalStateManager(); + } + + /** + * Gets the flag state manager. + * + * @return The flag state manager + */ + public SessionManager getSessionManager() { + return sessionManager; + } + + /** + * Get the global ConfigurationManager. + * USe this to access global configuration values and per-world configuration values. + * @return The global ConfigurationManager + */ + public ConfigurationManager getGlobalStateManager() { + return configuration; + } + + /** + * Get the supervisor. + * + * @return the supervisor + */ + public Supervisor getSupervisor() { + return supervisor; + } + + /** + * Get the global executor service for internal usage (please use your + * own executor service). + * + * @return the global executor service + */ + public ListeningExecutorService getExecutorService() { + return executorService; + } + + /** + * Get the profile lookup service. + * + * @return the profile lookup service + */ + public ProfileService getProfileService() { + return profileService; + } + + /** + * Get the profile cache. + * + * @return the profile cache + */ + public ProfileCache getProfileCache() { + return profileCache; + } + + /** + * Check whether a player is in a group. + * This calls the corresponding method in PermissionsResolverManager + * + * @param player The player to check + * @param group The group + * @return whether {@code player} is in {@code group} + */ + public boolean inGroup(Player player, String group) { + try { + return PermissionsResolverManager.getInstance().inGroup(player, group); + } catch (Throwable t) { + t.printStackTrace(); + return false; + } + } + + /** + * Get the groups of a player. + * This calls the corresponding method in PermissionsResolverManager. + * @param player The player to check + * @return The names of each group the playe is in. + */ + public String[] getGroups(Player player) { + try { + return PermissionsResolverManager.getInstance().getGroups(player); + } catch (Throwable t) { + t.printStackTrace(); + return new String[0]; + } + } + + /** + * Gets the name of a command sender. This is a unique name and this + * method should never return a "display name". + * + * @param sender The sender to get the name of + * @return The unique name of the sender. + */ + public String toUniqueName(CommandSender sender) { + if (sender instanceof ConsoleCommandSender) { + return "*Console*"; + } else { + return sender.getName(); + } + } + + /** + * Gets the name of a command sender. This play be a display name. + * + * @param sender The CommandSender to get the name of. + * @return The name of the given sender + */ + public String toName(CommandSender sender) { + if (sender instanceof ConsoleCommandSender) { + return "*Console*"; + } else if (sender instanceof Player) { + return ((Player) sender).getDisplayName(); + } else { + return sender.getName(); + } + } + + /** + * Checks permissions. + * + * @param sender The sender to check the permission on. + * @param perm The permission to check the permission on. + * @return whether {@code sender} has {@code perm} + */ + public boolean hasPermission(CommandSender sender, String perm) { + if (sender.isOp()) { + if (sender instanceof Player) { + if (this.getGlobalStateManager().get(((Player) sender). + getWorld()).opPermissions) { + return true; + } + } else { + return true; + } + } + + // Invoke the permissions resolver + if (sender instanceof Player) { + Player player = (Player) sender; + return PermissionsResolverManager.getInstance().hasPermission(player.getWorld().getName(), player, perm); + } + + return false; + } + + /** + * Checks permissions and throws an exception if permission is not met. + * + * @param sender The sender to check the permission on. + * @param perm The permission to check the permission on. + * @throws CommandPermissionsException if {@code sender} doesn't have {@code perm} + */ + public void checkPermission(CommandSender sender, String perm) + throws CommandPermissionsException { + if (!hasPermission(sender, perm)) { + throw new CommandPermissionsException(); + } + } + + /** + * Checks to see if the sender is a player, otherwise throw an exception. + * + * @param sender The {@link CommandSender} to check + * @return {@code sender} casted to a player + * @throws CommandException if {@code sender} isn't a {@link Player} + */ + public Player checkPlayer(CommandSender sender) + throws CommandException { + if (sender instanceof Player) { + return (Player) sender; + } else { + throw new CommandException("A player is expected."); + } + } + + /** + * Match player names. + * + * The filter string uses the following format: + * @[name] looks up all players with the exact {@code name} + * *[name] matches any player whose name contains {@code name} + * [name] matches any player whose name starts with {@code name} + * + * @param filter The filter string to check. + * @return A {@link List} of players who match {@code filter} + */ + public List matchPlayerNames(String filter) { + Collection players = BukkitUtil.getOnlinePlayers(); + + filter = filter.toLowerCase(); + + // Allow exact name matching + if (filter.charAt(0) == '@' && filter.length() >= 2) { + filter = filter.substring(1); + + for (Player player : players) { + if (player.getName().equalsIgnoreCase(filter)) { + List list = new ArrayList(); + list.add(player); + return list; + } + } + + return new ArrayList(); + // Allow partial name matching + } else if (filter.charAt(0) == '*' && filter.length() >= 2) { + filter = filter.substring(1); + + List list = new ArrayList(); + + for (Player player : players) { + if (player.getName().toLowerCase().contains(filter)) { + list.add(player); + } + } + + return list; + + // Start with name matching + } else { + List list = new ArrayList(); + + for (Player player : players) { + if (player.getName().toLowerCase().startsWith(filter)) { + list.add(player); + } + } + + return list; + } + } + + /** + * Checks if the given list of players is greater than size 0, otherwise + * throw an exception. + * + * @param players The {@link List} to check + * @return {@code players} as an {@link Iterable} + * @throws CommandException If {@code players} is empty + */ + protected Iterable checkPlayerMatch(List players) + throws CommandException { + // Check to see if there were any matches + if (players.size() == 0) { + throw new CommandException("No players matched query."); + } + + return players; + } + + /** + * Matches players based on the specified filter string + * + * The filter string format is as follows: + * * returns all the players currently online + * If {@code sender} is a {@link Player}: + * #world returns all players in the world that {@code sender} is in + * #near reaturns all players within 30 blocks of {@code sender}'s location + * Otherwise, the format is as specified in {@link #matchPlayerNames(String)} + * + * @param source The CommandSender who is trying to find a player + * @param filter The filter string for players + * @return iterator for players + * @throws CommandException if no matches are found + */ + public Iterable matchPlayers(CommandSender source, String filter) + throws CommandException { + + if (BukkitUtil.getOnlinePlayers().isEmpty()) { + throw new CommandException("No players matched query."); + } + + if (filter.equals("*")) { + return checkPlayerMatch(Lists.newArrayList(BukkitUtil.getOnlinePlayers())); + } + + // Handle special hash tag groups + if (filter.charAt(0) == '#') { + // Handle #world, which matches player of the same world as the + // calling source + if (filter.equalsIgnoreCase("#world")) { + List players = new ArrayList(); + Player sourcePlayer = checkPlayer(source); + World sourceWorld = sourcePlayer.getWorld(); + + for (Player player : BukkitUtil.getOnlinePlayers()) { + if (player.getWorld().equals(sourceWorld)) { + players.add(player); + } + } + + return checkPlayerMatch(players); + + // Handle #near, which is for nearby players. + } else if (filter.equalsIgnoreCase("#near")) { + List players = new ArrayList(); + Player sourcePlayer = checkPlayer(source); + World sourceWorld = sourcePlayer.getWorld(); + org.bukkit.util.Vector sourceVector + = sourcePlayer.getLocation().toVector(); + + for (Player player : BukkitUtil.getOnlinePlayers()) { + if (player.getWorld().equals(sourceWorld) + && player.getLocation().toVector().distanceSquared( + sourceVector) < 900) { + players.add(player); + } + } + + return checkPlayerMatch(players); + + } else { + throw new CommandException("Invalid group '" + filter + "'."); + } + } + + List players = matchPlayerNames(filter); + + return checkPlayerMatch(players); + } + + /** + * Match only a single player. + * + * @param sender The {@link CommandSender} who is requesting a player match + * @param filter The filter string. + * @see #matchPlayers(org.bukkit.entity.Player) for filter string syntax + * @return The single player + * @throws CommandException If more than one player match was found + */ + public Player matchSinglePlayer(CommandSender sender, String filter) + throws CommandException { + // This will throw an exception if there are no matches + Iterator players = matchPlayers(sender, filter).iterator(); + + Player match = players.next(); + + // We don't want to match the wrong person, so fail if if multiple + // players were found (we don't want to just pick off the first one, + // as that may be the wrong player) + if (players.hasNext()) { + throw new CommandException("More than one player found! " + + "Use @ for exact matching."); + } + + return match; + } + + /** + * Match only a single player or console. + * + * The filter string syntax is as follows: + * #console, *console, or ! return the server console + * All syntax from {@link #matchSinglePlayer(org.bukkit.command.CommandSender, String)} + * @param sender The sender trying to match a CommandSender + * @param filter The filter string + * @return The resulting CommandSender + * @throws CommandException if either zero or more than one player matched. + */ + public CommandSender matchPlayerOrConsole(CommandSender sender, String filter) + throws CommandException { + + // Let's see if console is wanted + if (filter.equalsIgnoreCase("#console") + || filter.equalsIgnoreCase("*console*") + || filter.equalsIgnoreCase("!")) { + return getServer().getConsoleSender(); + } + + return matchSinglePlayer(sender, filter); + } + + /** + * Get a single player as an iterator for players. + * + * @param player The player to return in an Iterable + * @return iterator for player + */ + public Iterable matchPlayers(Player player) { + return Arrays.asList(player); + } + + /** + * Match a world. + * + * The filter string syntax is as follows: + * #main returns the main world + * #normal returns the first world with a normal environment + * #nether return the first world with a nether environment + * #player:[name] returns the world that a player named {@code name} is located in, if the player is online. + * [name] A world with the name {@code name} + * + * @param sender The sender requesting a match + * @param filter The filter string + * @return The resulting world + * @throws CommandException if no world matches + */ + public World matchWorld(CommandSender sender, String filter) throws CommandException { + List worlds = getServer().getWorlds(); + + // Handle special hash tag groups + if (filter.charAt(0) == '#') { + // #main for the main world + if (filter.equalsIgnoreCase("#main")) { + return worlds.get(0); + + // #normal for the first normal world + } else if (filter.equalsIgnoreCase("#normal")) { + for (World world : worlds) { + if (world.getEnvironment() == Environment.NORMAL) { + return world; + } + } + + throw new CommandException("No normal world found."); + + // #nether for the first nether world + } else if (filter.equalsIgnoreCase("#nether")) { + for (World world : worlds) { + if (world.getEnvironment() == Environment.NETHER) { + return world; + } + } + + throw new CommandException("No nether world found."); + + // Handle getting a world from a player + } else if (filter.matches("^#player$")) { + String parts[] = filter.split(":", 2); + + // They didn't specify an argument for the player! + if (parts.length == 1) { + throw new CommandException("Argument expected for #player."); + } + + return matchPlayers(sender, parts[1]).iterator().next().getWorld(); + } else { + throw new CommandException("Invalid identifier '" + filter + "'."); + } + } + + for (World world : worlds) { + if (world.getName().equals(filter)) { + return world; + } + } + + throw new CommandException("No world by that exact name found."); + } + + /** + * Gets a copy of the WorldEdit plugin. + * + * @return The WorldEditPlugin instance + * @throws CommandException If there is no WorldEditPlugin available + */ + public WorldEditPlugin getWorldEdit() throws CommandException { + Plugin worldEdit = getServer().getPluginManager().getPlugin("WorldEdit"); + if (worldEdit == null) { + throw new CommandException("WorldEdit does not appear to be installed."); + } + + if (worldEdit instanceof WorldEditPlugin) { + return (WorldEditPlugin) worldEdit; + } else { + throw new CommandException("WorldEdit detection failed (report error)."); + } + } + + /** + * Wrap a player as a LocalPlayer. + * + * @param player The player to wrap + * @return The wrapped player + */ + public LocalPlayer wrapPlayer(Player player) { + return new BukkitPlayer(this, player); + } + + /** + * Wrap a player as a LocalPlayer. + * + * @param player The player to wrap + * @param silenced True to silence messages + * @return The wrapped player + */ + public LocalPlayer wrapPlayer(Player player, boolean silenced) { + return new BukkitPlayer(this, player, silenced); + } + + /** + * Wrap a player as a LocalPlayer. + * + *

This implementation is incomplete -- permissions cannot be checked.

+ * + * @param player The player to wrap + * @return The wrapped player + */ + public LocalPlayer wrapOfflinePlayer(OfflinePlayer player) { + return new BukkitOfflinePlayer(player); + } + + /** + * Return a protection query helper object that can be used by another + * plugin to test whether WorldGuard permits an action at a particular + * place. + * + * @return an instance + */ + public ProtectionQuery createProtectionQuery() { + return new ProtectionQuery(); + } + + /** + * Configure WorldGuard's loggers. + */ + private void configureLogger() { + RecordMessagePrefixer.register(Logger.getLogger("com.sk89q.worldguard"), "[WorldGuard] "); + } + + /** + * Create a default configuration file from the .jar. + * + * @param actual The destination file + * @param defaultName The name of the file inside the jar's defaults folder + */ + public void createDefaultConfiguration(File actual, + String defaultName) { + + // Make parent directories + File parent = actual.getParentFile(); + if (!parent.exists()) { + parent.mkdirs(); + } + + if (actual.exists()) { + return; + } + + InputStream input = + null; + try { + JarFile file = new JarFile(getFile()); + ZipEntry copy = file.getEntry("defaults/" + defaultName); + if (copy == null) throw new FileNotFoundException(); + input = file.getInputStream(copy); + } catch (IOException e) { + log.severe("Unable to read default configuration: " + defaultName); + } + + if (input != null) { + FileOutputStream output = null; + + try { + output = new FileOutputStream(actual); + byte[] buf = new byte[8192]; + int length = 0; + while ((length = input.read(buf)) > 0) { + output.write(buf, 0, length); + } + + log.info("Default configuration file written: " + + actual.getAbsolutePath()); + } catch (IOException e) { + e.printStackTrace(); + } finally { + try { + if (input != null) { + input.close(); + } + } catch (IOException ignore) { + } + + try { + if (output != null) { + output.close(); + } + } catch (IOException ignore) { + } + } + } + } + + /** + * Notifies all with the worldguard.notify permission. + * This will check both superperms and WEPIF, + * but makes sure WEPIF checks don't result in duplicate notifications + * + * @param msg The notification to broadcast + */ + public void broadcastNotification(String msg) { + getServer().broadcast(msg, "worldguard.notify"); + Set subs = getServer().getPluginManager().getPermissionSubscriptions("worldguard.notify"); + for (Player player : BukkitUtil.getOnlinePlayers()) { + if (!(subs.contains(player) && player.hasPermission("worldguard.notify")) && + hasPermission(player, "worldguard.notify")) { // Make sure the player wasn't already broadcasted to. + player.sendMessage(msg); + } + } + log.info(msg); + } + + /** + * Checks to see if a player can build at a location. This will return + * true if region protection is disabled. + * + * @param player The player to check. + * @param loc The location to check at. + * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.Location) + * @return whether {@code player} can build at {@code loc} + */ + public boolean canBuild(Player player, Location loc) { + return getGlobalRegionManager().canBuild(player, loc); + } + + /** + * Checks to see if a player can build at a location. This will return + * true if region protection is disabled. + * + * @param player The player to check + * @param block The block to check at. + * @see GlobalRegionManager#canBuild(org.bukkit.entity.Player, org.bukkit.block.Block) + * @return whether {@code player} can build at {@code block}'s location + */ + public boolean canBuild(Player player, Block block) { + return getGlobalRegionManager().canBuild(player, block); + } + + /** + * Gets the region manager for a world. + * + * @param world world to get the region manager for + * @return the region manager or null if regions are not enabled + */ + public RegionManager getRegionManager(World world) { + if (!getGlobalStateManager().get(world).useRegions) { + return null; + } + + return getGlobalRegionManager().get(world); + } + + public PlayerMoveListener getPlayerMoveListener() { + return playerMoveListener; + } + + /** + * Replace macros in the text. + * + * The macros replaced are as follows: + * %name%: The name of {@code sender}. See {@link #toName(org.bukkit.command.CommandSender)} + * %id%: The unique name of the sender. See {@link #toUniqueName(org.bukkit.command.CommandSender)} + * %online%: The number of players currently online on the server + * If {@code sender} is a Player: + * %world%: The name of the world {@code sender} is located in + * %health%: The health of {@code sender}. See {@link org.bukkit.entity.Player#getHealth()} + * + * @param sender The sender to check + * @param message The message to replace macros in + * @return The message with macros replaced + */ + public String replaceMacros(CommandSender sender, String message) { + Collection online = BukkitUtil.getOnlinePlayers(); + + message = message.replace("%name%", toName(sender)); + message = message.replace("%id%", toUniqueName(sender)); + message = message.replace("%online%", String.valueOf(online.size())); + + if (sender instanceof Player) { + Player player = (Player) sender; + World world = player.getWorld(); + + message = message.replace("%world%", world.getName()); + message = message.replace("%health%", String.valueOf(player.getHealth())); + } + + return message; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/AsyncCommandHelper.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/CommandUtils.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/DebuggingCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/DebuggingCommands.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/DebuggingCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/DebuggingCommands.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/FutureProgressListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java index bc6dd347..bbac5154 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java @@ -1,311 +1,311 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit.commands; - -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissions; -import com.sk89q.worldedit.blocks.ItemType; -import com.sk89q.worldguard.bukkit.ConfigurationManager; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.session.Session; -import com.sk89q.worldguard.session.handler.GodMode; -import org.bukkit.ChatColor; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.inventory.ItemStack; - -public class GeneralCommands { - private final WorldGuardPlugin plugin; - - public GeneralCommands(WorldGuardPlugin plugin) { - this.plugin = plugin; - } - - @SuppressWarnings("deprecation") - @Command(aliases = {"god"}, usage = "[player]", - desc = "Enable godmode on a player", flags = "s", max = 1) - public void god(CommandContext args, CommandSender sender) throws CommandException { - ConfigurationManager config = plugin.getGlobalStateManager(); - - Iterable targets = null; - boolean included = false; - - // Detect arguments based on the number of arguments provided - if (args.argsLength() == 0) { - targets = plugin.matchPlayers(plugin.checkPlayer(sender)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.god"); - } else { - targets = plugin.matchPlayers(sender, args.getString(0)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.god.other"); - } - - for (Player player : targets) { - Session session = plugin.getSessionManager().get(player); - - if (GodMode.set(player, session, true)) { - player.setFireTicks(0); - - // Tell the user - if (player.equals(sender)) { - player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable."); - - // Keep track of this - included = true; - } else { - player.sendMessage(ChatColor.YELLOW + "God enabled by " - + plugin.toName(sender) + "."); - - } - } - } - - // The player didn't receive any items, then we need to send the - // user a message so s/he know that something is indeed working - if (!included && args.hasFlag('s')) { - sender.sendMessage(ChatColor.YELLOW + "Players now have god mode."); - } - } - - @SuppressWarnings("deprecation") - @Command(aliases = {"ungod"}, usage = "[player]", - desc = "Disable godmode on a player", flags = "s", max = 1) - public void ungod(CommandContext args, CommandSender sender) throws CommandException { - ConfigurationManager config = plugin.getGlobalStateManager(); - - Iterable targets = null; - boolean included = false; - - // Detect arguments based on the number of arguments provided - if (args.argsLength() == 0) { - targets = plugin.matchPlayers(plugin.checkPlayer(sender)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.god"); - } else { - targets = plugin.matchPlayers(sender, args.getString(0)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.god.other"); - } - - for (Player player : targets) { - Session session = plugin.getSessionManager().get(player); - - if (GodMode.set(player, session, false)) { - // Tell the user - if (player.equals(sender)) { - player.sendMessage(ChatColor.YELLOW + "God mode disabled!"); - - // Keep track of this - included = true; - } else { - player.sendMessage(ChatColor.YELLOW + "God disabled by " - + plugin.toName(sender) + "."); - - } - } - } - - // The player didn't receive any items, then we need to send the - // user a message so s/he know that something is indeed working - if (!included && args.hasFlag('s')) { - sender.sendMessage(ChatColor.YELLOW + "Players no longer have god mode."); - } - } - - @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1) - public void heal(CommandContext args,CommandSender sender) throws CommandException { - - Iterable targets = null; - boolean included = false; - - // Detect arguments based on the number of arguments provided - if (args.argsLength() == 0) { - targets = plugin.matchPlayers(plugin.checkPlayer(sender)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.heal"); - } else if (args.argsLength() == 1) { - targets = plugin.matchPlayers(sender, args.getString(0)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.heal.other"); - } - - for (Player player : targets) { - player.setHealth(player.getMaxHealth()); - player.setFoodLevel(20); - - // Tell the user - if (player.equals(sender)) { - player.sendMessage(ChatColor.YELLOW + "Healed!"); - - // Keep track of this - included = true; - } else { - player.sendMessage(ChatColor.YELLOW + "Healed by " - + plugin.toName(sender) + "."); - - } - } - - // The player didn't receive any items, then we need to send the - // user a message so s/he know that something is indeed working - if (!included && args.hasFlag('s')) { - sender.sendMessage(ChatColor.YELLOW.toString() + "Players healed."); - } - } - - @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1) - public void slay(CommandContext args, CommandSender sender) throws CommandException { - - Iterable targets = null; - boolean included = false; - - // Detect arguments based on the number of arguments provided - if (args.argsLength() == 0) { - targets = plugin.matchPlayers(plugin.checkPlayer(sender)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.slay"); - } else if (args.argsLength() == 1) { - targets = plugin.matchPlayers(sender, args.getString(0)); - - // Check permissions! - plugin.checkPermission(sender, "worldguard.slay.other"); - } - - for (Player player : targets) { - player.setHealth(0); - - // Tell the user - if (player.equals(sender)) { - player.sendMessage(ChatColor.YELLOW + "Slain!"); - - // Keep track of this - included = true; - } else { - player.sendMessage(ChatColor.YELLOW + "Slain by " - + plugin.toName(sender) + "."); - - } - } - - // The player didn't receive any items, then we need to send the - // user a message so s/he know that something is indeed working - if (!included && args.hasFlag('s')) { - sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain."); - } - } - - @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1) - @CommandPermissions({"worldguard.locate"}) - public void locate(CommandContext args, CommandSender sender) throws CommandException { - - Player player = plugin.checkPlayer(sender); - - if (args.argsLength() == 0) { - player.setCompassTarget(player.getWorld().getSpawnLocation()); - - sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn."); - } else { - Player target = plugin.matchSinglePlayer(sender, args.getString(0)); - player.setCompassTarget(target.getLocation()); - - sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed."); - } - } - - @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0) - @CommandPermissions({"worldguard.stack"}) - public void stack(CommandContext args, CommandSender sender) throws CommandException { - - Player player = plugin.checkPlayer(sender); - boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate"); - boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged"); - - ItemStack[] items = player.getInventory().getContents(); - int len = items.length; - - int affected = 0; - - for (int i = 0; i < len; i++) { - ItemStack item = items[i]; - - // Avoid infinite stacks and stacks with durability - if (item == null || item.getAmount() <= 0 - || (!ignoreMax && item.getMaxStackSize() == 1)) { - continue; - } - - int max = ignoreMax ? 64 : item.getMaxStackSize(); - - if (item.getAmount() < max) { - int needed = max - item.getAmount(); // Number of needed items until max - - // Find another stack of the same type - for (int j = i + 1; j < len; j++) { - ItemStack item2 = items[j]; - - // Avoid infinite stacks and stacks with durability - if (item2 == null || item2.getAmount() <= 0 - || (!ignoreMax && item.getMaxStackSize() == 1)) { - continue; - } - - // Same type? - // Blocks store their color in the damage value - if (item2.getTypeId() == item.getTypeId() && - ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged) - || item.getDurability() == item2.getDurability()) && - ((item.getItemMeta() == null && item2.getItemMeta() == null) - || (item.getItemMeta() != null && - item.getItemMeta().equals(item2.getItemMeta())))) { - // This stack won't fit in the parent stack - if (item2.getAmount() > needed) { - item.setAmount(max); - item2.setAmount(item2.getAmount() - needed); - break; - // This stack will - } else { - items[j] = null; - item.setAmount(item.getAmount() + item2.getAmount()); - needed = max - item.getAmount(); - } - - affected++; - } - } - } - } - - if (affected > 0) { - player.getInventory().setContents(items); - } - - player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!"); - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit.commands; + +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissions; +import com.sk89q.worldedit.blocks.ItemType; +import com.sk89q.worldguard.bukkit.ConfigurationManager; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import com.sk89q.worldguard.session.Session; +import com.sk89q.worldguard.session.handler.GodMode; +import org.bukkit.ChatColor; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; +import org.bukkit.inventory.ItemStack; + +public class GeneralCommands { + private final WorldGuardPlugin plugin; + + public GeneralCommands(WorldGuardPlugin plugin) { + this.plugin = plugin; + } + + @SuppressWarnings("deprecation") + @Command(aliases = {"god"}, usage = "[player]", + desc = "Enable godmode on a player", flags = "s", max = 1) + public void god(CommandContext args, CommandSender sender) throws CommandException { + ConfigurationManager config = plugin.getGlobalStateManager(); + + Iterable targets = null; + boolean included = false; + + // Detect arguments based on the number of arguments provided + if (args.argsLength() == 0) { + targets = plugin.matchPlayers(plugin.checkPlayer(sender)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.god"); + } else { + targets = plugin.matchPlayers(sender, args.getString(0)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.god.other"); + } + + for (Player player : targets) { + Session session = plugin.getSessionManager().get(player); + + if (GodMode.set(player, session, true)) { + player.setFireTicks(0); + + // Tell the user + if (player.equals(sender)) { + player.sendMessage(ChatColor.YELLOW + "God mode enabled! Use /ungod to disable."); + + // Keep track of this + included = true; + } else { + player.sendMessage(ChatColor.YELLOW + "God enabled by " + + plugin.toName(sender) + "."); + + } + } + } + + // The player didn't receive any items, then we need to send the + // user a message so s/he know that something is indeed working + if (!included && args.hasFlag('s')) { + sender.sendMessage(ChatColor.YELLOW + "Players now have god mode."); + } + } + + @SuppressWarnings("deprecation") + @Command(aliases = {"ungod"}, usage = "[player]", + desc = "Disable godmode on a player", flags = "s", max = 1) + public void ungod(CommandContext args, CommandSender sender) throws CommandException { + ConfigurationManager config = plugin.getGlobalStateManager(); + + Iterable targets = null; + boolean included = false; + + // Detect arguments based on the number of arguments provided + if (args.argsLength() == 0) { + targets = plugin.matchPlayers(plugin.checkPlayer(sender)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.god"); + } else { + targets = plugin.matchPlayers(sender, args.getString(0)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.god.other"); + } + + for (Player player : targets) { + Session session = plugin.getSessionManager().get(player); + + if (GodMode.set(player, session, false)) { + // Tell the user + if (player.equals(sender)) { + player.sendMessage(ChatColor.YELLOW + "God mode disabled!"); + + // Keep track of this + included = true; + } else { + player.sendMessage(ChatColor.YELLOW + "God disabled by " + + plugin.toName(sender) + "."); + + } + } + } + + // The player didn't receive any items, then we need to send the + // user a message so s/he know that something is indeed working + if (!included && args.hasFlag('s')) { + sender.sendMessage(ChatColor.YELLOW + "Players no longer have god mode."); + } + } + + @Command(aliases = {"heal"}, usage = "[player]", desc = "Heal a player", flags = "s", max = 1) + public void heal(CommandContext args,CommandSender sender) throws CommandException { + + Iterable targets = null; + boolean included = false; + + // Detect arguments based on the number of arguments provided + if (args.argsLength() == 0) { + targets = plugin.matchPlayers(plugin.checkPlayer(sender)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.heal"); + } else if (args.argsLength() == 1) { + targets = plugin.matchPlayers(sender, args.getString(0)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.heal.other"); + } + + for (Player player : targets) { + player.setHealth(player.getMaxHealth()); + player.setFoodLevel(20); + + // Tell the user + if (player.equals(sender)) { + player.sendMessage(ChatColor.YELLOW + "Healed!"); + + // Keep track of this + included = true; + } else { + player.sendMessage(ChatColor.YELLOW + "Healed by " + + plugin.toName(sender) + "."); + + } + } + + // The player didn't receive any items, then we need to send the + // user a message so s/he know that something is indeed working + if (!included && args.hasFlag('s')) { + sender.sendMessage(ChatColor.YELLOW.toString() + "Players healed."); + } + } + + @Command(aliases = {"slay"}, usage = "[player]", desc = "Slay a player", flags = "s", max = 1) + public void slay(CommandContext args, CommandSender sender) throws CommandException { + + Iterable targets = null; + boolean included = false; + + // Detect arguments based on the number of arguments provided + if (args.argsLength() == 0) { + targets = plugin.matchPlayers(plugin.checkPlayer(sender)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.slay"); + } else if (args.argsLength() == 1) { + targets = plugin.matchPlayers(sender, args.getString(0)); + + // Check permissions! + plugin.checkPermission(sender, "worldguard.slay.other"); + } + + for (Player player : targets) { + player.setHealth(0); + + // Tell the user + if (player.equals(sender)) { + player.sendMessage(ChatColor.YELLOW + "Slain!"); + + // Keep track of this + included = true; + } else { + player.sendMessage(ChatColor.YELLOW + "Slain by " + + plugin.toName(sender) + "."); + + } + } + + // The player didn't receive any items, then we need to send the + // user a message so s/he know that something is indeed working + if (!included && args.hasFlag('s')) { + sender.sendMessage(ChatColor.YELLOW.toString() + "Players slain."); + } + } + + @Command(aliases = {"locate"}, usage = "[player]", desc = "Locate a player", max = 1) + @CommandPermissions({"worldguard.locate"}) + public void locate(CommandContext args, CommandSender sender) throws CommandException { + + Player player = plugin.checkPlayer(sender); + + if (args.argsLength() == 0) { + player.setCompassTarget(player.getWorld().getSpawnLocation()); + + sender.sendMessage(ChatColor.YELLOW.toString() + "Compass reset to spawn."); + } else { + Player target = plugin.matchSinglePlayer(sender, args.getString(0)); + player.setCompassTarget(target.getLocation()); + + sender.sendMessage(ChatColor.YELLOW.toString() + "Compass repointed."); + } + } + + @Command(aliases = {"stack", ";"}, usage = "", desc = "Stack items", max = 0) + @CommandPermissions({"worldguard.stack"}) + public void stack(CommandContext args, CommandSender sender) throws CommandException { + + Player player = plugin.checkPlayer(sender); + boolean ignoreMax = plugin.hasPermission(player, "worldguard.stack.illegitimate"); + boolean ignoreDamaged = plugin.hasPermission(player, "worldguard.stack.damaged"); + + ItemStack[] items = player.getInventory().getContents(); + int len = items.length; + + int affected = 0; + + for (int i = 0; i < len; i++) { + ItemStack item = items[i]; + + // Avoid infinite stacks and stacks with durability + if (item == null || item.getAmount() <= 0 + || (!ignoreMax && item.getMaxStackSize() == 1)) { + continue; + } + + int max = ignoreMax ? 64 : item.getMaxStackSize(); + + if (item.getAmount() < max) { + int needed = max - item.getAmount(); // Number of needed items until max + + // Find another stack of the same type + for (int j = i + 1; j < len; j++) { + ItemStack item2 = items[j]; + + // Avoid infinite stacks and stacks with durability + if (item2 == null || item2.getAmount() <= 0 + || (!ignoreMax && item.getMaxStackSize() == 1)) { + continue; + } + + // Same type? + // Blocks store their color in the damage value + if (item2.getTypeId() == item.getTypeId() && + ((!ItemType.usesDamageValue(item.getTypeId()) && ignoreDamaged) + || item.getDurability() == item2.getDurability()) && + ((item.getItemMeta() == null && item2.getItemMeta() == null) + || (item.getItemMeta() != null && + item.getItemMeta().equals(item2.getItemMeta())))) { + // This stack won't fit in the parent stack + if (item2.getAmount() > needed) { + item.setAmount(max); + item2.setAmount(item2.getAmount() - needed); + break; + // This stack will + } else { + items[j] = null; + item.setAmount(item.getAmount() + item2.getAmount()); + needed = max - item.getAmount(); + } + + affected++; + } + } + } + } + + if (affected > 0) { + player.getInventory().setContents(items); + } + + player.sendMessage(ChatColor.YELLOW + "Items compacted into stacks!"); + } +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageFutureCallback.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/MessageTimerTask.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java index d0a6db7a..bb44f50c 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java @@ -1,46 +1,46 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit.commands; - -import com.sk89q.worldguard.bukkit.commands.region.MemberCommands; -import com.sk89q.worldguard.bukkit.commands.region.RegionCommands; -import org.bukkit.command.CommandSender; - -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.NestedCommand; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; - -public class ProtectionCommands { - @SuppressWarnings("unused") - private final WorldGuardPlugin plugin; - - public ProtectionCommands(WorldGuardPlugin plugin) { - this.plugin = plugin; - } - - @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands") - @NestedCommand({RegionCommands.class, MemberCommands.class}) - public void region(CommandContext args, CommandSender sender) {} - - @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands") - @NestedCommand({WorldGuardCommands.class}) - public void worldGuard(CommandContext args, CommandSender sender) {} -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit.commands; + +import com.sk89q.worldguard.bukkit.commands.region.MemberCommands; +import com.sk89q.worldguard.bukkit.commands.region.RegionCommands; +import org.bukkit.command.CommandSender; + +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.NestedCommand; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; + +public class ProtectionCommands { + @SuppressWarnings("unused") + private final WorldGuardPlugin plugin; + + public ProtectionCommands(WorldGuardPlugin plugin) { + this.plugin = plugin; + } + + @Command(aliases = {"region", "regions", "rg"}, desc = "Region management commands") + @NestedCommand({RegionCommands.class, MemberCommands.class}) + public void region(CommandContext args, CommandSender sender) {} + + @Command(aliases = {"worldguard", "wg"}, desc = "WorldGuard commands") + @NestedCommand({WorldGuardCommands.class}) + public void worldGuard(CommandContext args, CommandSender sender) {} +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java index 50740f77..785442fb 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java @@ -1,165 +1,165 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit.commands; - -import org.bukkit.ChatColor; -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Entity; -import org.bukkit.entity.Player; - -import com.sk89q.minecraft.util.commands.Command; -import com.sk89q.minecraft.util.commands.CommandContext; -import com.sk89q.minecraft.util.commands.CommandException; -import com.sk89q.minecraft.util.commands.CommandPermissions; -import com.sk89q.worldguard.bukkit.BukkitUtil; -import com.sk89q.worldguard.bukkit.ConfigurationManager; -import com.sk89q.worldguard.bukkit.WorldConfiguration; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; - -public class ToggleCommands { - private final WorldGuardPlugin plugin; - - public ToggleCommands(WorldGuardPlugin plugin) { - this.plugin = plugin; - } - - @Command(aliases = {"stopfire"}, usage = "[]", - desc = "Disables all fire spread temporarily", max = 1) - @CommandPermissions({"worldguard.fire-toggle.stop"}) - public void stopFire(CommandContext args, CommandSender sender) throws CommandException { - - World world; - - if (args.argsLength() == 0) { - world = plugin.checkPlayer(sender).getWorld(); - } else { - world = plugin.matchWorld(sender, args.getString(0)); - } - - WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world); - - if (!wcfg.fireSpreadDisableToggle) { - plugin.getServer().broadcastMessage( - ChatColor.YELLOW - + "Fire spread has been globally disabled for '" + world.getName() + "' by " - + plugin.toName(sender) + "."); - } else { - sender.sendMessage( - ChatColor.YELLOW - + "Fire spread was already globally disabled."); - } - - wcfg.fireSpreadDisableToggle = true; - } - - @Command(aliases = {"allowfire"}, usage = "[]", - desc = "Allows all fire spread temporarily", max = 1) - @CommandPermissions({"worldguard.fire-toggle.stop"}) - public void allowFire(CommandContext args, CommandSender sender) throws CommandException { - - World world; - - if (args.argsLength() == 0) { - world = plugin.checkPlayer(sender).getWorld(); - } else { - world = plugin.matchWorld(sender, args.getString(0)); - } - - WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world); - - if (wcfg.fireSpreadDisableToggle) { - plugin.getServer().broadcastMessage(ChatColor.YELLOW - + "Fire spread has been globally for '" + world.getName() + "' re-enabled by " - + plugin.toName(sender) + "."); - } else { - sender.sendMessage(ChatColor.YELLOW - + "Fire spread was already globally enabled."); - } - - wcfg.fireSpreadDisableToggle = false; - } - - @Command(aliases = {"halt-activity", "stoplag", "haltactivity"}, - desc = "Attempts to cease as much activity in order to stop lag", flags = "cis", max = 0) - @CommandPermissions({"worldguard.halt-activity"}) - public void stopLag(CommandContext args, CommandSender sender) throws CommandException { - - ConfigurationManager configManager = plugin.getGlobalStateManager(); - - if (args.hasFlag('i')) { - if (configManager.activityHaltToggle) { - sender.sendMessage(ChatColor.YELLOW - + "ALL intensive server activity is not allowed."); - } else { - sender.sendMessage(ChatColor.YELLOW - + "ALL intensive server activity is allowed."); - } - } else { - configManager.activityHaltToggle = !args.hasFlag('c'); - - if (configManager.activityHaltToggle) { - if (!(sender instanceof Player)) { - sender.sendMessage(ChatColor.YELLOW - + "ALL intensive server activity halted."); - } - - if (!args.hasFlag('s')) { - plugin.getServer().broadcastMessage(ChatColor.YELLOW - + "ALL intensive server activity halted by " - + plugin.toName(sender) + "."); - } else { - sender.sendMessage(ChatColor.YELLOW - + "(Silent) ALL intensive server activity halted by " - + plugin.toName(sender) + "."); - } - - for (World world : plugin.getServer().getWorlds()) { - int removed = 0; - - for (Entity entity : world.getEntities()) { - if (BukkitUtil.isIntensiveEntity(entity)) { - entity.remove(); - removed++; - } - } - - if (removed > 10) { - sender.sendMessage("" + removed + " entities (>10) auto-removed from " - + world.getName()); - } - } - } else { - if (!args.hasFlag('s')) { - plugin.getServer().broadcastMessage(ChatColor.YELLOW - + "ALL intensive server activity is now allowed."); - - if (!(sender instanceof Player)) { - sender.sendMessage(ChatColor.YELLOW - + "ALL intensive server activity is now allowed."); - } - } else { - sender.sendMessage(ChatColor.YELLOW - + "(Silent) ALL intensive server activity is now allowed."); - } - } - } - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit.commands; + +import org.bukkit.ChatColor; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Entity; +import org.bukkit.entity.Player; + +import com.sk89q.minecraft.util.commands.Command; +import com.sk89q.minecraft.util.commands.CommandContext; +import com.sk89q.minecraft.util.commands.CommandException; +import com.sk89q.minecraft.util.commands.CommandPermissions; +import com.sk89q.worldguard.bukkit.BukkitUtil; +import com.sk89q.worldguard.bukkit.ConfigurationManager; +import com.sk89q.worldguard.bukkit.WorldConfiguration; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; + +public class ToggleCommands { + private final WorldGuardPlugin plugin; + + public ToggleCommands(WorldGuardPlugin plugin) { + this.plugin = plugin; + } + + @Command(aliases = {"stopfire"}, usage = "[]", + desc = "Disables all fire spread temporarily", max = 1) + @CommandPermissions({"worldguard.fire-toggle.stop"}) + public void stopFire(CommandContext args, CommandSender sender) throws CommandException { + + World world; + + if (args.argsLength() == 0) { + world = plugin.checkPlayer(sender).getWorld(); + } else { + world = plugin.matchWorld(sender, args.getString(0)); + } + + WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world); + + if (!wcfg.fireSpreadDisableToggle) { + plugin.getServer().broadcastMessage( + ChatColor.YELLOW + + "Fire spread has been globally disabled for '" + world.getName() + "' by " + + plugin.toName(sender) + "."); + } else { + sender.sendMessage( + ChatColor.YELLOW + + "Fire spread was already globally disabled."); + } + + wcfg.fireSpreadDisableToggle = true; + } + + @Command(aliases = {"allowfire"}, usage = "[]", + desc = "Allows all fire spread temporarily", max = 1) + @CommandPermissions({"worldguard.fire-toggle.stop"}) + public void allowFire(CommandContext args, CommandSender sender) throws CommandException { + + World world; + + if (args.argsLength() == 0) { + world = plugin.checkPlayer(sender).getWorld(); + } else { + world = plugin.matchWorld(sender, args.getString(0)); + } + + WorldConfiguration wcfg = plugin.getGlobalStateManager().get(world); + + if (wcfg.fireSpreadDisableToggle) { + plugin.getServer().broadcastMessage(ChatColor.YELLOW + + "Fire spread has been globally for '" + world.getName() + "' re-enabled by " + + plugin.toName(sender) + "."); + } else { + sender.sendMessage(ChatColor.YELLOW + + "Fire spread was already globally enabled."); + } + + wcfg.fireSpreadDisableToggle = false; + } + + @Command(aliases = {"halt-activity", "stoplag", "haltactivity"}, + desc = "Attempts to cease as much activity in order to stop lag", flags = "cis", max = 0) + @CommandPermissions({"worldguard.halt-activity"}) + public void stopLag(CommandContext args, CommandSender sender) throws CommandException { + + ConfigurationManager configManager = plugin.getGlobalStateManager(); + + if (args.hasFlag('i')) { + if (configManager.activityHaltToggle) { + sender.sendMessage(ChatColor.YELLOW + + "ALL intensive server activity is not allowed."); + } else { + sender.sendMessage(ChatColor.YELLOW + + "ALL intensive server activity is allowed."); + } + } else { + configManager.activityHaltToggle = !args.hasFlag('c'); + + if (configManager.activityHaltToggle) { + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.YELLOW + + "ALL intensive server activity halted."); + } + + if (!args.hasFlag('s')) { + plugin.getServer().broadcastMessage(ChatColor.YELLOW + + "ALL intensive server activity halted by " + + plugin.toName(sender) + "."); + } else { + sender.sendMessage(ChatColor.YELLOW + + "(Silent) ALL intensive server activity halted by " + + plugin.toName(sender) + "."); + } + + for (World world : plugin.getServer().getWorlds()) { + int removed = 0; + + for (Entity entity : world.getEntities()) { + if (BukkitUtil.isIntensiveEntity(entity)) { + entity.remove(); + removed++; + } + } + + if (removed > 10) { + sender.sendMessage("" + removed + " entities (>10) auto-removed from " + + world.getName()); + } + } + } else { + if (!args.hasFlag('s')) { + plugin.getServer().broadcastMessage(ChatColor.YELLOW + + "ALL intensive server activity is now allowed."); + + if (!(sender instanceof Player)) { + sender.sendMessage(ChatColor.YELLOW + + "ALL intensive server activity is now allowed."); + } + } else { + sender.sendMessage(ChatColor.YELLOW + + "(Silent) ALL intensive server activity is now allowed."); + } + } + } + } +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java index 1320e036..3839fc00 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java @@ -1,296 +1,296 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.bukkit.commands; - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.io.Files; -import com.google.common.util.concurrent.FutureCallback; -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.MoreExecutors; -import com.sk89q.minecraft.util.commands.*; -import com.sk89q.worldguard.bukkit.ConfigurationManager; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.bukkit.util.logging.LoggerToChatHandler; -import com.sk89q.worldguard.bukkit.util.report.*; -import com.sk89q.worldguard.util.profiler.SamplerBuilder; -import com.sk89q.worldguard.util.profiler.SamplerBuilder.Sampler; -import com.sk89q.worldguard.util.profiler.ThreadIdFilter; -import com.sk89q.worldguard.util.profiler.ThreadNameFilter; -import com.sk89q.worldguard.util.report.ReportList; -import com.sk89q.worldguard.util.report.SystemInfoReport; -import com.sk89q.worldguard.util.task.Task; -import com.sk89q.worldguard.util.task.TaskStateComparator; -import org.bukkit.Bukkit; -import org.bukkit.ChatColor; -import org.bukkit.World; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.lang.management.ThreadInfo; -import java.nio.charset.Charset; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.TimeUnit; -import java.util.logging.Level; -import java.util.logging.Logger; - -public class WorldGuardCommands { - - private static final Logger log = Logger.getLogger(WorldGuardCommands.class.getCanonicalName()); - - private final WorldGuardPlugin plugin; - @Nullable - private Sampler activeSampler; - - public WorldGuardCommands(WorldGuardPlugin plugin) { - this.plugin = plugin; - } - - @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0) - public void version(CommandContext args, CommandSender sender) throws CommandException { - sender.sendMessage(ChatColor.YELLOW - + "WorldGuard " + plugin.getDescription().getVersion()); - sender.sendMessage(ChatColor.YELLOW - + "http://www.sk89q.com"); - } - - @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0) - @CommandPermissions({"worldguard.reload"}) - public void reload(CommandContext args, CommandSender sender) throws CommandException { - // TODO: This is subject to a race condition, but at least other commands are not being processed concurrently - List> tasks = plugin.getSupervisor().getTasks(); - if (!tasks.isEmpty()) { - throw new CommandException("There are currently pending tasks. Use /wg running to monitor these tasks first."); - } - - LoggerToChatHandler handler = null; - Logger minecraftLogger = null; - - if (sender instanceof Player) { - handler = new LoggerToChatHandler(sender); - handler.setLevel(Level.ALL); - minecraftLogger = Logger.getLogger("com.sk89q.worldguard"); - minecraftLogger.addHandler(handler); - } - - try { - ConfigurationManager config = plugin.getGlobalStateManager(); - config.unload(); - config.load(); - for (World world : Bukkit.getServer().getWorlds()) { - config.get(world); - } - plugin.getRegionContainer().reload(); - // WGBukkit.cleanCache(); - sender.sendMessage("WorldGuard configuration reloaded."); - } catch (Throwable t) { - sender.sendMessage("Error while reloading: " - + t.getMessage()); - } finally { - if (minecraftLogger != null) { - minecraftLogger.removeHandler(handler); - } - } - } - - @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0) - @CommandPermissions({"worldguard.report"}) - public void report(CommandContext args, final CommandSender sender) throws CommandException { - ReportList report = new ReportList("Report"); - report.add(new SystemInfoReport()); - report.add(new ServerReport()); - report.add(new PluginReport()); - report.add(new SchedulerReport()); - report.add(new ServicesReport()); - report.add(new WorldReport()); - report.add(new PerformanceReport()); - report.add(new ConfigReport(plugin)); - String result = report.toString(); - - try { - File dest = new File(plugin.getDataFolder(), "report.txt"); - Files.write(result, dest, Charset.forName("UTF-8")); - sender.sendMessage(ChatColor.YELLOW + "WorldGuard report written to " + dest.getAbsolutePath()); - } catch (IOException e) { - throw new CommandException("Failed to write report: " + e.getMessage()); - } - - if (args.hasFlag('p')) { - plugin.checkPermission(sender, "worldguard.report.pastebin"); - CommandUtils.pastebin(plugin, sender, result, "WorldGuard report: %s.report"); - } - } - - @Command(aliases = {"profile"}, usage = "[]", - desc = "Profile the CPU usage of the server", min = 0, max = 1, - flags = "t:p") - @CommandPermissions("worldguard.profile") - public void profile(final CommandContext args, final CommandSender sender) throws CommandException { - Predicate threadFilter; - String threadName = args.getFlag('t'); - final boolean pastebin; - - if (args.hasFlag('p')) { - plugin.checkPermission(sender, "worldguard.report.pastebin"); - pastebin = true; - } else { - pastebin = false; - } - - if (threadName == null) { - threadFilter = new ThreadIdFilter(Thread.currentThread().getId()); - } else if (threadName.equals("*")) { - threadFilter = Predicates.alwaysTrue(); - } else { - threadFilter = new ThreadNameFilter(threadName); - } - - int minutes; - if (args.argsLength() == 0) { - minutes = 5; - } else { - minutes = args.getInteger(0); - if (minutes < 1) { - throw new CommandException("You must run the profile for at least 1 minute."); - } else if (minutes > 10) { - throw new CommandException("You can profile for, at maximum, 10 minutes."); - } - } - - Sampler sampler; - - synchronized (this) { - if (activeSampler != null) { - throw new CommandException("A profile is currently in progress! Please use /wg stopprofile to stop the current profile."); - } - - SamplerBuilder builder = new SamplerBuilder(); - builder.setThreadFilter(threadFilter); - builder.setRunTime(minutes, TimeUnit.MINUTES); - sampler = activeSampler = builder.start(); - } - - AsyncCommandHelper.wrap(sampler.getFuture(), plugin, sender) - .formatUsing(minutes) - .registerWithSupervisor("Running CPU profiler for %d minute(s)...") - .sendMessageAfterDelay("(Please wait... profiling for %d minute(s)...)") - .thenTellErrorsOnly("CPU profiling failed."); - - sampler.getFuture().addListener(new Runnable() { - @Override - public void run() { - synchronized (WorldGuardCommands.this) { - activeSampler = null; - } - } - }, MoreExecutors.sameThreadExecutor()); - - Futures.addCallback(sampler.getFuture(), new FutureCallback() { - @Override - public void onSuccess(Sampler result) { - String output = result.toString(); - - try { - File dest = new File(plugin.getDataFolder(), "profile.txt"); - Files.write(output, dest, Charset.forName("UTF-8")); - sender.sendMessage(ChatColor.YELLOW + "CPU profiling data written to " + dest.getAbsolutePath()); - } catch (IOException e) { - sender.sendMessage(ChatColor.RED + "Failed to write CPU profiling data: " + e.getMessage()); - } - - if (pastebin) { - CommandUtils.pastebin(plugin, sender, output, "Profile result: %s.profile"); - } - } - - @Override - public void onFailure(Throwable throwable) { - } - }); - } - - @Command(aliases = {"stopprofile"}, usage = "",desc = "Stop a running profile", min = 0, max = 0) - @CommandPermissions("worldguard.profile") - public void stopProfile(CommandContext args, final CommandSender sender) throws CommandException { - synchronized (this) { - if (activeSampler == null) { - throw new CommandException("No CPU profile is currently running."); - } - - activeSampler.cancel(); - activeSampler = null; - } - - sender.sendMessage("The running CPU profile has been stopped."); - } - - @Command(aliases = {"flushstates", "clearstates"}, - usage = "[player]", desc = "Flush the state manager", max = 1) - @CommandPermissions("worldguard.flushstates") - public void flushStates(CommandContext args, CommandSender sender) throws CommandException { - if (args.argsLength() == 0) { - plugin.getSessionManager().resetAllStates(); - sender.sendMessage("Cleared all states."); - } else { - Player player = plugin.getServer().getPlayer(args.getString(0)); - if (player != null) { - plugin.getSessionManager().resetState(player); - sender.sendMessage("Cleared states for player \"" + player.getName() + "\"."); - } - } - } - - @Command(aliases = {"running", "queue"}, desc = "List running tasks", max = 0) - @CommandPermissions("worldguard.running") - public void listRunningTasks(CommandContext args, CommandSender sender) throws CommandException { - List> tasks = plugin.getSupervisor().getTasks(); - - if (!tasks.isEmpty()) { - Collections.sort(tasks, new TaskStateComparator()); - StringBuilder builder = new StringBuilder(); - builder.append(ChatColor.GRAY); - builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"); - builder.append(" Running tasks "); - builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"); - builder.append("\n").append(ChatColor.GRAY).append("Note: Some 'running' tasks may be waiting to be start."); - for (Task task : tasks) { - builder.append("\n"); - builder.append(ChatColor.BLUE).append("(").append(task.getState().name()).append(") "); - builder.append(ChatColor.YELLOW); - builder.append(CommandUtils.getOwnerName(task.getOwner())); - builder.append(": "); - builder.append(ChatColor.WHITE); - builder.append(task.getName()); - } - sender.sendMessage(builder.toString()); - } else { - sender.sendMessage(ChatColor.YELLOW + "There are currently no running tasks."); - } - } - - @Command(aliases = {"debug"}, desc = "Debugging commands") - @NestedCommand({DebuggingCommands.class}) - public void debug(CommandContext args, CommandSender sender) {} - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.bukkit.commands; + +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.io.Files; +import com.google.common.util.concurrent.FutureCallback; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.MoreExecutors; +import com.sk89q.minecraft.util.commands.*; +import com.sk89q.worldguard.bukkit.ConfigurationManager; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import com.sk89q.worldguard.bukkit.util.logging.LoggerToChatHandler; +import com.sk89q.worldguard.bukkit.util.report.*; +import com.sk89q.worldguard.util.profiler.SamplerBuilder; +import com.sk89q.worldguard.util.profiler.SamplerBuilder.Sampler; +import com.sk89q.worldguard.util.profiler.ThreadIdFilter; +import com.sk89q.worldguard.util.profiler.ThreadNameFilter; +import com.sk89q.worldguard.util.report.ReportList; +import com.sk89q.worldguard.util.report.SystemInfoReport; +import com.sk89q.worldguard.util.task.Task; +import com.sk89q.worldguard.util.task.TaskStateComparator; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.World; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +import javax.annotation.Nullable; +import java.io.File; +import java.io.IOException; +import java.lang.management.ThreadInfo; +import java.nio.charset.Charset; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.TimeUnit; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class WorldGuardCommands { + + private static final Logger log = Logger.getLogger(WorldGuardCommands.class.getCanonicalName()); + + private final WorldGuardPlugin plugin; + @Nullable + private Sampler activeSampler; + + public WorldGuardCommands(WorldGuardPlugin plugin) { + this.plugin = plugin; + } + + @Command(aliases = {"version"}, desc = "Get the WorldGuard version", max = 0) + public void version(CommandContext args, CommandSender sender) throws CommandException { + sender.sendMessage(ChatColor.YELLOW + + "WorldGuard " + plugin.getDescription().getVersion()); + sender.sendMessage(ChatColor.YELLOW + + "http://www.sk89q.com"); + } + + @Command(aliases = {"reload"}, desc = "Reload WorldGuard configuration", max = 0) + @CommandPermissions({"worldguard.reload"}) + public void reload(CommandContext args, CommandSender sender) throws CommandException { + // TODO: This is subject to a race condition, but at least other commands are not being processed concurrently + List> tasks = plugin.getSupervisor().getTasks(); + if (!tasks.isEmpty()) { + throw new CommandException("There are currently pending tasks. Use /wg running to monitor these tasks first."); + } + + LoggerToChatHandler handler = null; + Logger minecraftLogger = null; + + if (sender instanceof Player) { + handler = new LoggerToChatHandler(sender); + handler.setLevel(Level.ALL); + minecraftLogger = Logger.getLogger("com.sk89q.worldguard"); + minecraftLogger.addHandler(handler); + } + + try { + ConfigurationManager config = plugin.getGlobalStateManager(); + config.unload(); + config.load(); + for (World world : Bukkit.getServer().getWorlds()) { + config.get(world); + } + plugin.getRegionContainer().reload(); + // WGBukkit.cleanCache(); + sender.sendMessage("WorldGuard configuration reloaded."); + } catch (Throwable t) { + sender.sendMessage("Error while reloading: " + + t.getMessage()); + } finally { + if (minecraftLogger != null) { + minecraftLogger.removeHandler(handler); + } + } + } + + @Command(aliases = {"report"}, desc = "Writes a report on WorldGuard", flags = "p", max = 0) + @CommandPermissions({"worldguard.report"}) + public void report(CommandContext args, final CommandSender sender) throws CommandException { + ReportList report = new ReportList("Report"); + report.add(new SystemInfoReport()); + report.add(new ServerReport()); + report.add(new PluginReport()); + report.add(new SchedulerReport()); + report.add(new ServicesReport()); + report.add(new WorldReport()); + report.add(new PerformanceReport()); + report.add(new ConfigReport(plugin)); + String result = report.toString(); + + try { + File dest = new File(plugin.getDataFolder(), "report.txt"); + Files.write(result, dest, Charset.forName("UTF-8")); + sender.sendMessage(ChatColor.YELLOW + "WorldGuard report written to " + dest.getAbsolutePath()); + } catch (IOException e) { + throw new CommandException("Failed to write report: " + e.getMessage()); + } + + if (args.hasFlag('p')) { + plugin.checkPermission(sender, "worldguard.report.pastebin"); + CommandUtils.pastebin(plugin, sender, result, "WorldGuard report: %s.report"); + } + } + + @Command(aliases = {"profile"}, usage = "[]", + desc = "Profile the CPU usage of the server", min = 0, max = 1, + flags = "t:p") + @CommandPermissions("worldguard.profile") + public void profile(final CommandContext args, final CommandSender sender) throws CommandException { + Predicate threadFilter; + String threadName = args.getFlag('t'); + final boolean pastebin; + + if (args.hasFlag('p')) { + plugin.checkPermission(sender, "worldguard.report.pastebin"); + pastebin = true; + } else { + pastebin = false; + } + + if (threadName == null) { + threadFilter = new ThreadIdFilter(Thread.currentThread().getId()); + } else if (threadName.equals("*")) { + threadFilter = Predicates.alwaysTrue(); + } else { + threadFilter = new ThreadNameFilter(threadName); + } + + int minutes; + if (args.argsLength() == 0) { + minutes = 5; + } else { + minutes = args.getInteger(0); + if (minutes < 1) { + throw new CommandException("You must run the profile for at least 1 minute."); + } else if (minutes > 10) { + throw new CommandException("You can profile for, at maximum, 10 minutes."); + } + } + + Sampler sampler; + + synchronized (this) { + if (activeSampler != null) { + throw new CommandException("A profile is currently in progress! Please use /wg stopprofile to stop the current profile."); + } + + SamplerBuilder builder = new SamplerBuilder(); + builder.setThreadFilter(threadFilter); + builder.setRunTime(minutes, TimeUnit.MINUTES); + sampler = activeSampler = builder.start(); + } + + AsyncCommandHelper.wrap(sampler.getFuture(), plugin, sender) + .formatUsing(minutes) + .registerWithSupervisor("Running CPU profiler for %d minute(s)...") + .sendMessageAfterDelay("(Please wait... profiling for %d minute(s)...)") + .thenTellErrorsOnly("CPU profiling failed."); + + sampler.getFuture().addListener(new Runnable() { + @Override + public void run() { + synchronized (WorldGuardCommands.this) { + activeSampler = null; + } + } + }, MoreExecutors.sameThreadExecutor()); + + Futures.addCallback(sampler.getFuture(), new FutureCallback() { + @Override + public void onSuccess(Sampler result) { + String output = result.toString(); + + try { + File dest = new File(plugin.getDataFolder(), "profile.txt"); + Files.write(output, dest, Charset.forName("UTF-8")); + sender.sendMessage(ChatColor.YELLOW + "CPU profiling data written to " + dest.getAbsolutePath()); + } catch (IOException e) { + sender.sendMessage(ChatColor.RED + "Failed to write CPU profiling data: " + e.getMessage()); + } + + if (pastebin) { + CommandUtils.pastebin(plugin, sender, output, "Profile result: %s.profile"); + } + } + + @Override + public void onFailure(Throwable throwable) { + } + }); + } + + @Command(aliases = {"stopprofile"}, usage = "",desc = "Stop a running profile", min = 0, max = 0) + @CommandPermissions("worldguard.profile") + public void stopProfile(CommandContext args, final CommandSender sender) throws CommandException { + synchronized (this) { + if (activeSampler == null) { + throw new CommandException("No CPU profile is currently running."); + } + + activeSampler.cancel(); + activeSampler = null; + } + + sender.sendMessage("The running CPU profile has been stopped."); + } + + @Command(aliases = {"flushstates", "clearstates"}, + usage = "[player]", desc = "Flush the state manager", max = 1) + @CommandPermissions("worldguard.flushstates") + public void flushStates(CommandContext args, CommandSender sender) throws CommandException { + if (args.argsLength() == 0) { + plugin.getSessionManager().resetAllStates(); + sender.sendMessage("Cleared all states."); + } else { + Player player = plugin.getServer().getPlayer(args.getString(0)); + if (player != null) { + plugin.getSessionManager().resetState(player); + sender.sendMessage("Cleared states for player \"" + player.getName() + "\"."); + } + } + } + + @Command(aliases = {"running", "queue"}, desc = "List running tasks", max = 0) + @CommandPermissions("worldguard.running") + public void listRunningTasks(CommandContext args, CommandSender sender) throws CommandException { + List> tasks = plugin.getSupervisor().getTasks(); + + if (!tasks.isEmpty()) { + Collections.sort(tasks, new TaskStateComparator()); + StringBuilder builder = new StringBuilder(); + builder.append(ChatColor.GRAY); + builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"); + builder.append(" Running tasks "); + builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550"); + builder.append("\n").append(ChatColor.GRAY).append("Note: Some 'running' tasks may be waiting to be start."); + for (Task task : tasks) { + builder.append("\n"); + builder.append(ChatColor.BLUE).append("(").append(task.getState().name()).append(") "); + builder.append(ChatColor.YELLOW); + builder.append(CommandUtils.getOwnerName(task.getOwner())); + builder.append(": "); + builder.append(ChatColor.WHITE); + builder.append(task.getName()); + } + sender.sendMessage(builder.toString()); + } else { + sender.sendMessage(ChatColor.YELLOW + "There are currently no running tasks."); + } + } + + @Command(aliases = {"debug"}, desc = "Debugging commands") + @NestedCommand({DebuggingCommands.class}) + public void debug(CommandContext args, CommandSender sender) {} + +} diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/MemberCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/MemberCommands.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/region/MemberCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/MemberCommands.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommands.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionCommandsBase.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/region/RegionPrintoutBuilder.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionAdder.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionAdder.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionAdder.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionAdder.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionLister.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionLister.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionLister.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionLister.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerReloader.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerReloader.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerReloader.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerReloader.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerSaver.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerSaver.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerSaver.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionManagerSaver.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionRemover.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionRemover.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionRemover.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/commands/task/RegionRemover.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/internal/BukkitBlacklist.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/BukkitBlacklist.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/internal/BukkitBlacklist.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/BukkitBlacklist.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/SpongeUtil.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/SpongeUtil.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/SpongeUtil.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/SpongeUtil.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockBlockPair.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockBlockPair.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockBlockPair.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockBlockPair.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockMaterialPair.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockMaterialPair.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockMaterialPair.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockMaterialPair.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/permission/AbstractPermissionModel.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/permission/AbstractPermissionModel.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/permission/AbstractPermissionModel.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/permission/AbstractPermissionModel.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/permission/RegionPermissionModel.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/protection/DelayedRegionOverlapAssociation.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/DelayedRegionOverlapAssociation.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/protection/DelayedRegionOverlapAssociation.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/DelayedRegionOverlapAssociation.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/Events.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/Locations.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Locations.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/Locations.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Locations.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/logging/LoggerToChatHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/LoggerToChatHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/logging/LoggerToChatHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/LoggerToChatHandler.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/ConfigReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ConfigReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/ConfigReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ConfigReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java diff --git a/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java diff --git a/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/chest/ChestProtection.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java index 94fe6ed0..58f58cea 100644 --- a/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/ChestProtection.java @@ -1,77 +1,77 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.chest; - -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.entity.Player; - -/** - * Interface for chest protection. - */ -public interface ChestProtection { - - /** - * Returns whether a block is protected. - * - * @param block The block to check - * @param player The player to check - * @return Whether the block is protected for player - */ - public boolean isProtected(Block block, Player player); - - /** - * Returns whether a location where a chest block is trying to be created - * is protected. - * - * @param block The block to check - * @param player The player to check - * @return Whether {@code player} can place a block at the specified block - */ - public boolean isProtectedPlacement(Block block, Player player); - - /** - * Returns whether an adjacent chest is protected. - * - * @param searchBlock The block to check - * @param player The player to check - * @return Whether {@code searchBlock} is protected from access by {@code player} - */ - public boolean isAdjacentChestProtected(Block searchBlock, Player player); - - /** - * Returns whether a material is a chest. - * - * @param material The material to check - * @deprecated see {@link #isChest(int)} - * @return {@link #isChest(int)} - */ - @Deprecated - public boolean isChest(Material material); - - /** - * Returns whether a material is a chest. - * - * @param type The type to check - * @return Whether type is a 'chest' (block that can be protected) - */ - public boolean isChest(int type); - +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.chest; + +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.entity.Player; + +/** + * Interface for chest protection. + */ +public interface ChestProtection { + + /** + * Returns whether a block is protected. + * + * @param block The block to check + * @param player The player to check + * @return Whether the block is protected for player + */ + public boolean isProtected(Block block, Player player); + + /** + * Returns whether a location where a chest block is trying to be created + * is protected. + * + * @param block The block to check + * @param player The player to check + * @return Whether {@code player} can place a block at the specified block + */ + public boolean isProtectedPlacement(Block block, Player player); + + /** + * Returns whether an adjacent chest is protected. + * + * @param searchBlock The block to check + * @param player The player to check + * @return Whether {@code searchBlock} is protected from access by {@code player} + */ + public boolean isAdjacentChestProtected(Block searchBlock, Player player); + + /** + * Returns whether a material is a chest. + * + * @param material The material to check + * @deprecated see {@link #isChest(int)} + * @return {@link #isChest(int)} + */ + @Deprecated + public boolean isChest(Material material); + + /** + * Returns whether a material is a chest. + * + * @param type The type to check + * @return Whether type is a 'chest' (block that can be protected) + */ + public boolean isChest(int type); + } \ No newline at end of file diff --git a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java index e31d7de5..1dcb5899 100644 --- a/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java @@ -1,159 +1,159 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.chest; - -import com.sk89q.worldedit.blocks.BlockID; -import org.bukkit.Material; -import org.bukkit.block.Block; -import org.bukkit.block.BlockState; -import org.bukkit.block.Sign; -import org.bukkit.entity.Player; - -/** - * Sign-based chest protection. - * - * @author sk89q - */ -public class SignChestProtection implements ChestProtection { - - public boolean isProtected(Block block, Player player) { - if (isChest(block.getTypeId())) { - Block below = block.getRelative(0, -1, 0); - return isProtectedSignAround(below, player); - } else if (block.getTypeId() == BlockID.SIGN_POST) { - return isProtectedSignAndChestBinary(block, player); - } else { - Block above = block.getRelative(0, 1, 0); - Boolean res = isProtectedSign(above, player); - if (res != null) return res; - return false; - } - } - - public boolean isProtectedPlacement(Block block, Player player) { - return isProtectedSignAround(block, player); - } - - private boolean isProtectedSignAround(Block searchBlock, Player player) { - Block side; - Boolean res; - - side = searchBlock; - res = isProtectedSign(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(-1, 0, 0); - res = isProtectedSignAndChest(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(1, 0, 0); - res = isProtectedSignAndChest(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(0, 0, -1); - res = isProtectedSignAndChest(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(0, 0, 1); - res = isProtectedSignAndChest(side, player); - if (res != null && res) return res; - - return false; - } - - private Boolean isProtectedSign(Sign sign, Player player) { - if (sign.getLine(0).equalsIgnoreCase("[Lock]")) { - if (player == null) { // No player, no access - return true; - } - - String name = player.getName(); - if (name.equalsIgnoreCase(sign.getLine(1).trim()) - || name.equalsIgnoreCase(sign.getLine(2).trim()) - || name.equalsIgnoreCase(sign.getLine(3).trim())) { - return false; - } - - // No access! - return true; - } - - return null; - } - - private Boolean isProtectedSign(Block block, Player player) { - BlockState state = block.getState(); - if (state == null || !(state instanceof Sign)) { - return null; - } - return isProtectedSign((Sign) state, player); - } - - private Boolean isProtectedSignAndChest(Block block, Player player) { - if (!isChest(block.getRelative(0, 1, 0).getTypeId())) { - return null; - } - return isProtectedSign(block, player); - } - - private boolean isProtectedSignAndChestBinary(Block block, Player player) { - Boolean res = isProtectedSignAndChest(block, player); - return !(res == null || !res); - } - - public boolean isAdjacentChestProtected(Block searchBlock, Player player) { - Block side; - Boolean res; - - side = searchBlock; - res = isProtected(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(-1, 0, 0); - res = isProtected(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(1, 0, 0); - res = isProtected(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(0, 0, -1); - res = isProtected(side, player); - if (res != null && res) return res; - - side = searchBlock.getRelative(0, 0, 1); - res = isProtected(side, player); - if (res != null && res) return res; - - return false; - } - - @Deprecated - public boolean isChest(Material material) { - return isChest(material.getId()); - } - - public boolean isChest(int type) { - return type == BlockID.CHEST - || type == BlockID.DISPENSER - || type == BlockID.FURNACE - || type == BlockID.BURNING_FURNACE; - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.chest; + +import com.sk89q.worldedit.blocks.BlockID; +import org.bukkit.Material; +import org.bukkit.block.Block; +import org.bukkit.block.BlockState; +import org.bukkit.block.Sign; +import org.bukkit.entity.Player; + +/** + * Sign-based chest protection. + * + * @author sk89q + */ +public class SignChestProtection implements ChestProtection { + + public boolean isProtected(Block block, Player player) { + if (isChest(block.getTypeId())) { + Block below = block.getRelative(0, -1, 0); + return isProtectedSignAround(below, player); + } else if (block.getTypeId() == BlockID.SIGN_POST) { + return isProtectedSignAndChestBinary(block, player); + } else { + Block above = block.getRelative(0, 1, 0); + Boolean res = isProtectedSign(above, player); + if (res != null) return res; + return false; + } + } + + public boolean isProtectedPlacement(Block block, Player player) { + return isProtectedSignAround(block, player); + } + + private boolean isProtectedSignAround(Block searchBlock, Player player) { + Block side; + Boolean res; + + side = searchBlock; + res = isProtectedSign(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(-1, 0, 0); + res = isProtectedSignAndChest(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(1, 0, 0); + res = isProtectedSignAndChest(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(0, 0, -1); + res = isProtectedSignAndChest(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(0, 0, 1); + res = isProtectedSignAndChest(side, player); + if (res != null && res) return res; + + return false; + } + + private Boolean isProtectedSign(Sign sign, Player player) { + if (sign.getLine(0).equalsIgnoreCase("[Lock]")) { + if (player == null) { // No player, no access + return true; + } + + String name = player.getName(); + if (name.equalsIgnoreCase(sign.getLine(1).trim()) + || name.equalsIgnoreCase(sign.getLine(2).trim()) + || name.equalsIgnoreCase(sign.getLine(3).trim())) { + return false; + } + + // No access! + return true; + } + + return null; + } + + private Boolean isProtectedSign(Block block, Player player) { + BlockState state = block.getState(); + if (state == null || !(state instanceof Sign)) { + return null; + } + return isProtectedSign((Sign) state, player); + } + + private Boolean isProtectedSignAndChest(Block block, Player player) { + if (!isChest(block.getRelative(0, 1, 0).getTypeId())) { + return null; + } + return isProtectedSign(block, player); + } + + private boolean isProtectedSignAndChestBinary(Block block, Player player) { + Boolean res = isProtectedSignAndChest(block, player); + return !(res == null || !res); + } + + public boolean isAdjacentChestProtected(Block searchBlock, Player player) { + Block side; + Boolean res; + + side = searchBlock; + res = isProtected(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(-1, 0, 0); + res = isProtected(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(1, 0, 0); + res = isProtected(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(0, 0, -1); + res = isProtected(side, player); + if (res != null && res) return res; + + side = searchBlock.getRelative(0, 0, 1); + res = isProtected(side, player); + if (res != null && res) return res; + + return false; + } + + @Deprecated + public boolean isChest(Material material) { + return isChest(material.getId()); + } + + public boolean isChest(int type) { + return type == BlockID.CHEST + || type == BlockID.DISPENSER + || type == BlockID.FURNACE + || type == BlockID.BURNING_FURNACE; + } +} diff --git a/src/main/java/com/sk89q/worldguard/domains/Association.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/Association.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/domains/Association.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/Association.java diff --git a/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java index cdd15c4a..dc26904a 100644 --- a/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java @@ -1,371 +1,371 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.domains; - -import com.google.common.collect.ImmutableMap; -import com.sk89q.squirrelid.Profile; -import com.sk89q.squirrelid.cache.ProfileCache; -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.util.ChangeTracked; - -import javax.annotation.Nullable; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.UUID; - -import static com.google.common.base.Preconditions.checkNotNull; - -/** - * A combination of a {@link PlayerDomain} and a {@link GroupDomain}. - */ -public class DefaultDomain implements Domain, ChangeTracked { - - private PlayerDomain playerDomain = new PlayerDomain(); - private GroupDomain groupDomain = new GroupDomain(); - - /** - * Create a new domain. - */ - public DefaultDomain() { - } - - /** - * Create a new domain from an existing one, making a copy of all values. - * - * @param existing the other domain to copy values from - */ - public DefaultDomain(DefaultDomain existing) { - setPlayerDomain(existing.getPlayerDomain()); - setGroupDomain(existing.getGroupDomain()); - } - - /** - * Get the domain that holds the players. - * - * @return a domain - */ - public PlayerDomain getPlayerDomain() { - return playerDomain; - } - - /** - * Set a new player domain. - * - * @param playerDomain a domain - */ - public void setPlayerDomain(PlayerDomain playerDomain) { - checkNotNull(playerDomain); - this.playerDomain = new PlayerDomain(playerDomain); - } - - /** - * Set the domain that holds the groups. - * - * @return a domain - */ - public GroupDomain getGroupDomain() { - return groupDomain; - } - - /** - * Set a new group domain. - * - * @param groupDomain a domain - */ - public void setGroupDomain(GroupDomain groupDomain) { - checkNotNull(groupDomain); - this.groupDomain = new GroupDomain(groupDomain); - } - - /** - * Add the given player to the domain, identified by the player's name. - * - * @param name the name of the player - */ - public void addPlayer(String name) { - playerDomain.addPlayer(name); - } - - /** - * Remove the given player from the domain, identified by the player's name. - * - * @param name the name of the player - */ - public void removePlayer(String name) { - playerDomain.removePlayer(name); - } - - /** - * Remove the given player from the domain, identified by the player's UUID. - * - * @param uuid the UUID of the player - */ - public void removePlayer(UUID uuid) { - playerDomain.removePlayer(uuid); - } - - /** - * Add the given player to the domain, identified by the player's UUID. - * - * @param uniqueId the UUID of the player - */ - public void addPlayer(UUID uniqueId) { - playerDomain.addPlayer(uniqueId); - } - - /** - * Remove the given player from the domain, identified by either the - * player's name, the player's unique ID, or both. - * - * @param player the player - */ - public void removePlayer(LocalPlayer player) { - playerDomain.removePlayer(player); - } - - /** - * Add the given player to the domain, identified by the player's UUID. - * - * @param player the player - */ - public void addPlayer(LocalPlayer player) { - playerDomain.addPlayer(player); - } - - /** - * Add all the entries from another domain. - * - * @param other the other domain - */ - public void addAll(DefaultDomain other) { - checkNotNull(other); - for (String player : other.getPlayers()) { - addPlayer(player); - } - for (UUID uuid : other.getUniqueIds()) { - addPlayer(uuid); - } - for (String group : other.getGroups()) { - addGroup(group); - } - } - - /** - * Remove all the entries from another domain. - * - * @param other the other domain - */ - public void removeAll(DefaultDomain other) { - checkNotNull(other); - for (String player : other.getPlayers()) { - removePlayer(player); - } - for (UUID uuid : other.getUniqueIds()) { - removePlayer(uuid); - } - for (String group : other.getGroups()) { - removeGroup(group); - } - } - - /** - * Get the set of player names. - * - * @return the set of player names - */ - public Set getPlayers() { - return playerDomain.getPlayers(); - } - - /** - * Get the set of player UUIDs. - * - * @return the set of player UUIDs - */ - public Set getUniqueIds() { - return playerDomain.getUniqueIds(); - } - - /** - * Add the name of the group to the domain. - * - * @param name the name of the group. - */ - public void addGroup(String name) { - groupDomain.addGroup(name); - } - - /** - * Remove the given group from the domain. - * - * @param name the name of the group - */ - public void removeGroup(String name) { - groupDomain.removeGroup(name); - } - - /** - * Get the set of group names. - * - * @return the set of group names - */ - public Set getGroups() { - return groupDomain.getGroups(); - } - - @Override - public boolean contains(LocalPlayer player) { - return playerDomain.contains(player) || groupDomain.contains(player); - } - - @Override - public boolean contains(UUID uniqueId) { - return playerDomain.contains(uniqueId); - } - - @Override - public boolean contains(String playerName) { - return playerDomain.contains(playerName); - } - - @Override - public int size() { - return groupDomain.size() + playerDomain.size(); - } - - @Override - public void clear() { - playerDomain.clear(); - groupDomain.clear(); - } - - public void removeAll() { - clear(); - } - - public String toPlayersString() { - return toPlayersString(null); - } - - @SuppressWarnings("deprecation") - public String toPlayersString(@Nullable ProfileCache cache) { - StringBuilder str = new StringBuilder(); - List output = new ArrayList(); - - for (String name : playerDomain.getPlayers()) { - output.add("name:" + name); - } - - if (cache != null) { - ImmutableMap results = cache.getAllPresent(playerDomain.getUniqueIds()); - for (UUID uuid : playerDomain.getUniqueIds()) { - Profile profile = results.get(uuid); - if (profile != null) { - output.add(profile.getName() + "*"); - } else { - output.add("uuid:" + uuid); - } - } - } else { - for (UUID uuid : playerDomain.getUniqueIds()) { - output.add("uuid:" + uuid); - } - } - - Collections.sort(output, String.CASE_INSENSITIVE_ORDER); - for (Iterator it = output.iterator(); it.hasNext();) { - str.append(it.next()); - if (it.hasNext()) { - str.append(", "); - } - } - return str.toString(); - } - - public String toGroupsString() { - StringBuilder str = new StringBuilder(); - for (Iterator it = groupDomain.getGroups().iterator(); it.hasNext(); ) { - str.append("*"); - str.append(it.next()); - if (it.hasNext()) { - str.append(", "); - } - } - return str.toString(); - } - - public String toUserFriendlyString() { - StringBuilder str = new StringBuilder(); - - if (playerDomain.size() > 0) { - str.append(toPlayersString()); - } - - if (groupDomain.size() > 0) { - if (str.length() > 0) { - str.append("; "); - } - - str.append(toGroupsString()); - } - - return str.toString(); - } - - public String toUserFriendlyString(ProfileCache cache) { - StringBuilder str = new StringBuilder(); - - if (playerDomain.size() > 0) { - str.append(toPlayersString(cache)); - } - - if (groupDomain.size() > 0) { - if (str.length() > 0) { - str.append("; "); - } - - str.append(toGroupsString()); - } - - return str.toString(); - } - - @Override - public boolean isDirty() { - return playerDomain.isDirty() || groupDomain.isDirty(); - } - - @Override - public void setDirty(boolean dirty) { - playerDomain.setDirty(dirty); - groupDomain.setDirty(dirty); - } - - @Override - public String toString() { - return "{players=" + playerDomain + - ", groups=" + groupDomain + - '}'; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.domains; + +import com.google.common.collect.ImmutableMap; +import com.sk89q.squirrelid.Profile; +import com.sk89q.squirrelid.cache.ProfileCache; +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.util.ChangeTracked; + +import javax.annotation.Nullable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.UUID; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * A combination of a {@link PlayerDomain} and a {@link GroupDomain}. + */ +public class DefaultDomain implements Domain, ChangeTracked { + + private PlayerDomain playerDomain = new PlayerDomain(); + private GroupDomain groupDomain = new GroupDomain(); + + /** + * Create a new domain. + */ + public DefaultDomain() { + } + + /** + * Create a new domain from an existing one, making a copy of all values. + * + * @param existing the other domain to copy values from + */ + public DefaultDomain(DefaultDomain existing) { + setPlayerDomain(existing.getPlayerDomain()); + setGroupDomain(existing.getGroupDomain()); + } + + /** + * Get the domain that holds the players. + * + * @return a domain + */ + public PlayerDomain getPlayerDomain() { + return playerDomain; + } + + /** + * Set a new player domain. + * + * @param playerDomain a domain + */ + public void setPlayerDomain(PlayerDomain playerDomain) { + checkNotNull(playerDomain); + this.playerDomain = new PlayerDomain(playerDomain); + } + + /** + * Set the domain that holds the groups. + * + * @return a domain + */ + public GroupDomain getGroupDomain() { + return groupDomain; + } + + /** + * Set a new group domain. + * + * @param groupDomain a domain + */ + public void setGroupDomain(GroupDomain groupDomain) { + checkNotNull(groupDomain); + this.groupDomain = new GroupDomain(groupDomain); + } + + /** + * Add the given player to the domain, identified by the player's name. + * + * @param name the name of the player + */ + public void addPlayer(String name) { + playerDomain.addPlayer(name); + } + + /** + * Remove the given player from the domain, identified by the player's name. + * + * @param name the name of the player + */ + public void removePlayer(String name) { + playerDomain.removePlayer(name); + } + + /** + * Remove the given player from the domain, identified by the player's UUID. + * + * @param uuid the UUID of the player + */ + public void removePlayer(UUID uuid) { + playerDomain.removePlayer(uuid); + } + + /** + * Add the given player to the domain, identified by the player's UUID. + * + * @param uniqueId the UUID of the player + */ + public void addPlayer(UUID uniqueId) { + playerDomain.addPlayer(uniqueId); + } + + /** + * Remove the given player from the domain, identified by either the + * player's name, the player's unique ID, or both. + * + * @param player the player + */ + public void removePlayer(LocalPlayer player) { + playerDomain.removePlayer(player); + } + + /** + * Add the given player to the domain, identified by the player's UUID. + * + * @param player the player + */ + public void addPlayer(LocalPlayer player) { + playerDomain.addPlayer(player); + } + + /** + * Add all the entries from another domain. + * + * @param other the other domain + */ + public void addAll(DefaultDomain other) { + checkNotNull(other); + for (String player : other.getPlayers()) { + addPlayer(player); + } + for (UUID uuid : other.getUniqueIds()) { + addPlayer(uuid); + } + for (String group : other.getGroups()) { + addGroup(group); + } + } + + /** + * Remove all the entries from another domain. + * + * @param other the other domain + */ + public void removeAll(DefaultDomain other) { + checkNotNull(other); + for (String player : other.getPlayers()) { + removePlayer(player); + } + for (UUID uuid : other.getUniqueIds()) { + removePlayer(uuid); + } + for (String group : other.getGroups()) { + removeGroup(group); + } + } + + /** + * Get the set of player names. + * + * @return the set of player names + */ + public Set getPlayers() { + return playerDomain.getPlayers(); + } + + /** + * Get the set of player UUIDs. + * + * @return the set of player UUIDs + */ + public Set getUniqueIds() { + return playerDomain.getUniqueIds(); + } + + /** + * Add the name of the group to the domain. + * + * @param name the name of the group. + */ + public void addGroup(String name) { + groupDomain.addGroup(name); + } + + /** + * Remove the given group from the domain. + * + * @param name the name of the group + */ + public void removeGroup(String name) { + groupDomain.removeGroup(name); + } + + /** + * Get the set of group names. + * + * @return the set of group names + */ + public Set getGroups() { + return groupDomain.getGroups(); + } + + @Override + public boolean contains(LocalPlayer player) { + return playerDomain.contains(player) || groupDomain.contains(player); + } + + @Override + public boolean contains(UUID uniqueId) { + return playerDomain.contains(uniqueId); + } + + @Override + public boolean contains(String playerName) { + return playerDomain.contains(playerName); + } + + @Override + public int size() { + return groupDomain.size() + playerDomain.size(); + } + + @Override + public void clear() { + playerDomain.clear(); + groupDomain.clear(); + } + + public void removeAll() { + clear(); + } + + public String toPlayersString() { + return toPlayersString(null); + } + + @SuppressWarnings("deprecation") + public String toPlayersString(@Nullable ProfileCache cache) { + StringBuilder str = new StringBuilder(); + List output = new ArrayList(); + + for (String name : playerDomain.getPlayers()) { + output.add("name:" + name); + } + + if (cache != null) { + ImmutableMap results = cache.getAllPresent(playerDomain.getUniqueIds()); + for (UUID uuid : playerDomain.getUniqueIds()) { + Profile profile = results.get(uuid); + if (profile != null) { + output.add(profile.getName() + "*"); + } else { + output.add("uuid:" + uuid); + } + } + } else { + for (UUID uuid : playerDomain.getUniqueIds()) { + output.add("uuid:" + uuid); + } + } + + Collections.sort(output, String.CASE_INSENSITIVE_ORDER); + for (Iterator it = output.iterator(); it.hasNext();) { + str.append(it.next()); + if (it.hasNext()) { + str.append(", "); + } + } + return str.toString(); + } + + public String toGroupsString() { + StringBuilder str = new StringBuilder(); + for (Iterator it = groupDomain.getGroups().iterator(); it.hasNext(); ) { + str.append("*"); + str.append(it.next()); + if (it.hasNext()) { + str.append(", "); + } + } + return str.toString(); + } + + public String toUserFriendlyString() { + StringBuilder str = new StringBuilder(); + + if (playerDomain.size() > 0) { + str.append(toPlayersString()); + } + + if (groupDomain.size() > 0) { + if (str.length() > 0) { + str.append("; "); + } + + str.append(toGroupsString()); + } + + return str.toString(); + } + + public String toUserFriendlyString(ProfileCache cache) { + StringBuilder str = new StringBuilder(); + + if (playerDomain.size() > 0) { + str.append(toPlayersString(cache)); + } + + if (groupDomain.size() > 0) { + if (str.length() > 0) { + str.append("; "); + } + + str.append(toGroupsString()); + } + + return str.toString(); + } + + @Override + public boolean isDirty() { + return playerDomain.isDirty() || groupDomain.isDirty(); + } + + @Override + public void setDirty(boolean dirty) { + playerDomain.setDirty(dirty); + groupDomain.setDirty(dirty); + } + + @Override + public String toString() { + return "{players=" + playerDomain + + ", groups=" + groupDomain + + '}'; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/domains/Domain.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/Domain.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/domains/Domain.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/Domain.java index 0d9c3f5a..8c3235ab 100644 --- a/src/main/java/com/sk89q/worldguard/domains/Domain.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/Domain.java @@ -1,73 +1,73 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.domains; - -import com.sk89q.worldguard.LocalPlayer; - -import java.util.UUID; - -/** - * A domain contains a list of memberships. - */ -public interface Domain { - - /** - * Returns true if a domain contains a player. - * - * @param player the player to check - * @return whether this domain contains {@code player} - */ - boolean contains(LocalPlayer player); - - /** - * Returns true if a domain contains a player. - * - *

This method doesn't check for groups!

- * - * @param uniqueId the UUID of the user - * @return whether this domain contains a player by that name - */ - boolean contains(UUID uniqueId); - - /** - * Returns true if a domain contains a player. - * - *

This method doesn't check for groups!

- * - * @param playerName The name of the player to check - * @return whether this domain contains a player by that name - * @deprecated names are deprecated in MC 1.7+ in favor of UUIDs - */ - @Deprecated - boolean contains(String playerName); - - /** - * Get the number of entries. - * - * @return the number of entries - */ - int size(); - - /** - * Remove all entries. - */ - void clear(); - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.domains; + +import com.sk89q.worldguard.LocalPlayer; + +import java.util.UUID; + +/** + * A domain contains a list of memberships. + */ +public interface Domain { + + /** + * Returns true if a domain contains a player. + * + * @param player the player to check + * @return whether this domain contains {@code player} + */ + boolean contains(LocalPlayer player); + + /** + * Returns true if a domain contains a player. + * + *

This method doesn't check for groups!

+ * + * @param uniqueId the UUID of the user + * @return whether this domain contains a player by that name + */ + boolean contains(UUID uniqueId); + + /** + * Returns true if a domain contains a player. + * + *

This method doesn't check for groups!

+ * + * @param playerName The name of the player to check + * @return whether this domain contains a player by that name + * @deprecated names are deprecated in MC 1.7+ in favor of UUIDs + */ + @Deprecated + boolean contains(String playerName); + + /** + * Get the number of entries. + * + * @return the number of entries + */ + int size(); + + /** + * Remove all entries. + */ + void clear(); + +} diff --git a/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/domains/DomainCollection.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java index f149e24a..5359a494 100644 --- a/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java @@ -1,91 +1,91 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.domains; - -import com.sk89q.worldguard.LocalPlayer; - -import java.util.LinkedHashSet; -import java.util.Set; -import java.util.UUID; - -/** - * @deprecated not used by WorldGuard and not maintained - */ -@Deprecated -public class DomainCollection implements Domain { - - private Set domains; - - public DomainCollection() { - domains = new LinkedHashSet(); - } - - public void add(Domain domain) { - domains.add(domain); - } - - public void remove(Domain domain) { - domains.remove(domain); - } - - @Override - public int size() { - return domains.size(); - } - - @Override - public void clear() { - domains.clear(); - } - - @Override - public boolean contains(LocalPlayer player) { - for (Domain domain : domains) { - if (domain.contains(player)) { - return true; - } - } - - return false; - } - - @Override - public boolean contains(UUID uniqueId) { - for (Domain domain : domains) { - if (domain.contains(uniqueId)) { - return true; - } - } - - return false; - } - - @Override - public boolean contains(String playerName) { - for (Domain domain : domains) { - if (domain.contains(playerName)) { - return true; - } - } - - return false; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.domains; + +import com.sk89q.worldguard.LocalPlayer; + +import java.util.LinkedHashSet; +import java.util.Set; +import java.util.UUID; + +/** + * @deprecated not used by WorldGuard and not maintained + */ +@Deprecated +public class DomainCollection implements Domain { + + private Set domains; + + public DomainCollection() { + domains = new LinkedHashSet(); + } + + public void add(Domain domain) { + domains.add(domain); + } + + public void remove(Domain domain) { + domains.remove(domain); + } + + @Override + public int size() { + return domains.size(); + } + + @Override + public void clear() { + domains.clear(); + } + + @Override + public boolean contains(LocalPlayer player) { + for (Domain domain : domains) { + if (domain.contains(player)) { + return true; + } + } + + return false; + } + + @Override + public boolean contains(UUID uniqueId) { + for (Domain domain : domains) { + if (domain.contains(uniqueId)) { + return true; + } + } + + return false; + } + + @Override + public boolean contains(String playerName) { + for (Domain domain : domains) { + if (domain.contains(playerName)) { + return true; + } + } + + return false; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/domains/GroupDomain.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java index 344da282..d9a0386b 100644 --- a/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java @@ -1,151 +1,151 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.domains; - -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.util.ChangeTracked; - -import java.util.Collections; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CopyOnWriteArraySet; - -import static com.google.common.base.Preconditions.checkNotNull; - -/** - * Contains groups in a domain. - */ -public class GroupDomain implements Domain, ChangeTracked { - - private final Set groups = new CopyOnWriteArraySet(); - private boolean dirty = true; - - /** - * Create a new instance. - */ - public GroupDomain() { - } - - /** - * Create a new instance with copies from another domain. - * - * @param domain the domain to copy values from - */ - public GroupDomain(GroupDomain domain) { - checkNotNull(domain, "domain"); - groups.addAll(domain.getGroups()); - } - - /** - * Create a new instance. - * - * @param groups an array of groups - */ - public GroupDomain(String[] groups) { - checkNotNull(groups); - for (String group : groups) { - addGroup(group); - } - } - - /** - * Add the name of the group to the domain. - * - * @param name the name of the group. - */ - public void addGroup(String name) { - checkNotNull(name); - if (!name.trim().isEmpty()) { - setDirty(true); - groups.add(name.trim().toLowerCase()); - } - } - - /** - * Remove the given group from the domain. - * - * @param name the name of the group - */ - public void removeGroup(String name) { - checkNotNull(name); - setDirty(true); - groups.remove(name.trim().toLowerCase()); - } - - @Override - public boolean contains(LocalPlayer player) { - checkNotNull(player); - for (String group : groups) { - if (player.hasGroup(group)) { - return true; - } - } - - return false; - } - - /** - * Get the set of group names. - * - * @return the set of group names - */ - public Set getGroups() { - return Collections.unmodifiableSet(groups); - } - - @Override - public boolean contains(UUID uniqueId) { - return false; // GroupDomains can't contain UUIDs - } - - @Override - public boolean contains(String playerName) { - return false; // GroupDomains can't contain player names. - } - - @Override - public int size() { - return groups.size(); - } - - @Override - public void clear() { - setDirty(true); - groups.clear(); - } - - @Override - public boolean isDirty() { - return dirty; - } - - @Override - public void setDirty(boolean dirty) { - this.dirty = dirty; - } - - @Override - public String toString() { - return "{" + - "names=" + groups + - '}'; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.domains; + +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.util.ChangeTracked; + +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.CopyOnWriteArraySet; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * Contains groups in a domain. + */ +public class GroupDomain implements Domain, ChangeTracked { + + private final Set groups = new CopyOnWriteArraySet(); + private boolean dirty = true; + + /** + * Create a new instance. + */ + public GroupDomain() { + } + + /** + * Create a new instance with copies from another domain. + * + * @param domain the domain to copy values from + */ + public GroupDomain(GroupDomain domain) { + checkNotNull(domain, "domain"); + groups.addAll(domain.getGroups()); + } + + /** + * Create a new instance. + * + * @param groups an array of groups + */ + public GroupDomain(String[] groups) { + checkNotNull(groups); + for (String group : groups) { + addGroup(group); + } + } + + /** + * Add the name of the group to the domain. + * + * @param name the name of the group. + */ + public void addGroup(String name) { + checkNotNull(name); + if (!name.trim().isEmpty()) { + setDirty(true); + groups.add(name.trim().toLowerCase()); + } + } + + /** + * Remove the given group from the domain. + * + * @param name the name of the group + */ + public void removeGroup(String name) { + checkNotNull(name); + setDirty(true); + groups.remove(name.trim().toLowerCase()); + } + + @Override + public boolean contains(LocalPlayer player) { + checkNotNull(player); + for (String group : groups) { + if (player.hasGroup(group)) { + return true; + } + } + + return false; + } + + /** + * Get the set of group names. + * + * @return the set of group names + */ + public Set getGroups() { + return Collections.unmodifiableSet(groups); + } + + @Override + public boolean contains(UUID uniqueId) { + return false; // GroupDomains can't contain UUIDs + } + + @Override + public boolean contains(String playerName) { + return false; // GroupDomains can't contain player names. + } + + @Override + public int size() { + return groups.size(); + } + + @Override + public void clear() { + setDirty(true); + groups.clear(); + } + + @Override + public boolean isDirty() { + return dirty; + } + + @Override + public void setDirty(boolean dirty) { + this.dirty = dirty; + } + + @Override + public String toString() { + return "{" + + "names=" + groups + + '}'; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java index 7958e517..58e589ea 100644 --- a/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java @@ -1,210 +1,210 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.domains; - -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.util.ChangeTracked; - -import java.util.Collections; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.CopyOnWriteArraySet; - -import static com.google.common.base.Preconditions.checkNotNull; - -/** - * Stores players (only) in a domain. - */ -public class PlayerDomain implements Domain, ChangeTracked { - - private final Set uniqueIds = new CopyOnWriteArraySet(); - private final Set names = new CopyOnWriteArraySet(); - private boolean dirty = true; - - /** - * Create a new instance. - */ - public PlayerDomain() { - } - - /** - * Create a new instance. - * - * @param domain the domain to copy values from - */ - public PlayerDomain(PlayerDomain domain) { - checkNotNull(domain, "domain"); - uniqueIds.addAll(domain.getUniqueIds()); - names.addAll(domain.getPlayers()); - dirty = true; - } - - /** - * Create a new instance with the given names. - * - * @param names an array of names - * @deprecated names are deprecated in favor of UUIDs in MC 1.7+ - */ - @Deprecated - public PlayerDomain(String[] names) { - for (String name : names) { - addPlayer(name); - } - } - - /** - * Add the given player to the domain, identified by the player's name. - * - * @param name the name of the player - */ - public void addPlayer(String name) { - checkNotNull(name); - if (!name.trim().isEmpty()) { - setDirty(true); - names.add(name.trim().toLowerCase()); - // Trim because some names contain spaces (previously valid Minecraft - // names) and we cannot store these correctly in the SQL storage - // implementations - } - } - - /** - * Add the given player to the domain, identified by the player's UUID. - * - * @param uniqueId the UUID of the player - */ - public void addPlayer(UUID uniqueId) { - checkNotNull(uniqueId); - setDirty(true); - uniqueIds.add(uniqueId); - } - - /** - * Add the given player to the domain, identified by the player's UUID. - * - * @param player the player - */ - public void addPlayer(LocalPlayer player) { - checkNotNull(player); - setDirty(true); - addPlayer(player.getUniqueId()); - } - - /** - * Remove the given player from the domain, identified by the player's name. - * - * @param name the name of the player - */ - public void removePlayer(String name) { - checkNotNull(name); - setDirty(true); - names.remove(name.trim().toLowerCase()); - } - - /** - * Remove the given player from the domain, identified by the player's UUID. - * - * @param uuid the UUID of the player - */ - public void removePlayer(UUID uuid) { - checkNotNull(uuid); - setDirty(true); - uniqueIds.remove(uuid); - } - - /** - * Remove the given player from the domain, identified by either the - * player's name, the player's unique ID, or both. - * - * @param player the player - */ - public void removePlayer(LocalPlayer player) { - checkNotNull(player); - setDirty(true); - removePlayer(player.getName()); - removePlayer(player.getUniqueId()); - } - - @Override - public boolean contains(LocalPlayer player) { - checkNotNull(player); - return contains(player.getName().trim().toLowerCase()) || contains(player.getUniqueId()); - } - - /** - * Get the set of player names. - * - * @return the set of player names - */ - public Set getPlayers() { - return Collections.unmodifiableSet(names); - } - - /** - * Get the set of player UUIDs. - * - * @return the set of player UUIDs - */ - public Set getUniqueIds() { - return Collections.unmodifiableSet(uniqueIds); - } - - @Override - public boolean contains(UUID uniqueId) { - checkNotNull(uniqueId); - return uniqueIds.contains(uniqueId); - } - - @Override - public boolean contains(String playerName) { - checkNotNull(playerName); - return names.contains(playerName.trim().toLowerCase()); - } - - @Override - public int size() { - return names.size() + uniqueIds.size(); - } - - @Override - public void clear() { - setDirty(true); - uniqueIds.clear(); - names.clear(); - } - - @Override - public boolean isDirty() { - return dirty; - } - - @Override - public void setDirty(boolean dirty) { - this.dirty = dirty; - } - - @Override - public String toString() { - return "{" + - "uuids=" + uniqueIds + - ", names=" + names + - '}'; - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.domains; + +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.util.ChangeTracked; + +import java.util.Collections; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.CopyOnWriteArraySet; + +import static com.google.common.base.Preconditions.checkNotNull; + +/** + * Stores players (only) in a domain. + */ +public class PlayerDomain implements Domain, ChangeTracked { + + private final Set uniqueIds = new CopyOnWriteArraySet(); + private final Set names = new CopyOnWriteArraySet(); + private boolean dirty = true; + + /** + * Create a new instance. + */ + public PlayerDomain() { + } + + /** + * Create a new instance. + * + * @param domain the domain to copy values from + */ + public PlayerDomain(PlayerDomain domain) { + checkNotNull(domain, "domain"); + uniqueIds.addAll(domain.getUniqueIds()); + names.addAll(domain.getPlayers()); + dirty = true; + } + + /** + * Create a new instance with the given names. + * + * @param names an array of names + * @deprecated names are deprecated in favor of UUIDs in MC 1.7+ + */ + @Deprecated + public PlayerDomain(String[] names) { + for (String name : names) { + addPlayer(name); + } + } + + /** + * Add the given player to the domain, identified by the player's name. + * + * @param name the name of the player + */ + public void addPlayer(String name) { + checkNotNull(name); + if (!name.trim().isEmpty()) { + setDirty(true); + names.add(name.trim().toLowerCase()); + // Trim because some names contain spaces (previously valid Minecraft + // names) and we cannot store these correctly in the SQL storage + // implementations + } + } + + /** + * Add the given player to the domain, identified by the player's UUID. + * + * @param uniqueId the UUID of the player + */ + public void addPlayer(UUID uniqueId) { + checkNotNull(uniqueId); + setDirty(true); + uniqueIds.add(uniqueId); + } + + /** + * Add the given player to the domain, identified by the player's UUID. + * + * @param player the player + */ + public void addPlayer(LocalPlayer player) { + checkNotNull(player); + setDirty(true); + addPlayer(player.getUniqueId()); + } + + /** + * Remove the given player from the domain, identified by the player's name. + * + * @param name the name of the player + */ + public void removePlayer(String name) { + checkNotNull(name); + setDirty(true); + names.remove(name.trim().toLowerCase()); + } + + /** + * Remove the given player from the domain, identified by the player's UUID. + * + * @param uuid the UUID of the player + */ + public void removePlayer(UUID uuid) { + checkNotNull(uuid); + setDirty(true); + uniqueIds.remove(uuid); + } + + /** + * Remove the given player from the domain, identified by either the + * player's name, the player's unique ID, or both. + * + * @param player the player + */ + public void removePlayer(LocalPlayer player) { + checkNotNull(player); + setDirty(true); + removePlayer(player.getName()); + removePlayer(player.getUniqueId()); + } + + @Override + public boolean contains(LocalPlayer player) { + checkNotNull(player); + return contains(player.getName().trim().toLowerCase()) || contains(player.getUniqueId()); + } + + /** + * Get the set of player names. + * + * @return the set of player names + */ + public Set getPlayers() { + return Collections.unmodifiableSet(names); + } + + /** + * Get the set of player UUIDs. + * + * @return the set of player UUIDs + */ + public Set getUniqueIds() { + return Collections.unmodifiableSet(uniqueIds); + } + + @Override + public boolean contains(UUID uniqueId) { + checkNotNull(uniqueId); + return uniqueIds.contains(uniqueId); + } + + @Override + public boolean contains(String playerName) { + checkNotNull(playerName); + return names.contains(playerName.trim().toLowerCase()); + } + + @Override + public int size() { + return names.size() + uniqueIds.size(); + } + + @Override + public void clear() { + setDirty(true); + uniqueIds.clear(); + names.clear(); + } + + @Override + public boolean isDirty() { + return dirty; + } + + @Override + public void setDirty(boolean dirty) { + this.dirty = dirty; + } + + @Override + public String toString() { + return "{" + + "uuids=" + uniqueIds + + ", names=" + names + + '}'; + } +} diff --git a/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/internal/PermissionModel.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/internal/PermissionModel.java diff --git a/src/main/java/com/sk89q/worldguard/internal/util/sql/StatementUtils.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/internal/util/sql/StatementUtils.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/internal/util/sql/StatementUtils.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/internal/util/sql/StatementUtils.java diff --git a/src/main/java/com/sk89q/worldguard/protection/AbstractRegionSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/AbstractRegionSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/AbstractRegionSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/AbstractRegionSet.java diff --git a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java index 90ca07dd..ebbf207a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java @@ -1,244 +1,244 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.bukkit.RegionQuery; -import com.sk89q.worldguard.protection.association.RegionAssociable; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.Flag; -import com.sk89q.worldguard.protection.flags.RegionGroup; -import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.flags.StateFlag.State; -import com.sk89q.worldguard.protection.managers.RegionManager; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; - -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.Set; - -/** - * Represents the effective set of flags, owners, and members for a given - * spatial query. - * - *

An instance of this can be created using the spatial query methods - * available on {@link RegionManager}.

- */ -public interface ApplicableRegionSet extends Iterable { - - /** - * Return whether this region set is a virtual set. A virtual set - * does not contain real results. - * - *

A virtual result may be returned if region data failed to load or - * there was some special exception (i.e. the region bypass permission). - *

- * - *

Be sure to check the value of this flag if an instance of this - * interface is being retrieved from {@link RegionQuery} as it may - * return an instance of {@link PermissiveRegionSet} or - * {@link FailedLoadRegionSet}, among other possibilities.

- * - * @return true if loaded - * @see FailedLoadRegionSet - */ - boolean isVirtual(); - - /** - * Tests whether the {@link DefaultFlag#BUILD} flag or membership - * requirements permit the given player. - * - * @param player the player to check - * @return true if permitted - * @deprecated use {@link #testState(RegionAssociable, StateFlag...)} - */ - @Deprecated - boolean canBuild(LocalPlayer player); - - /** - * Test whether the (effective) value for a list of state flags equals - * {@code ALLOW}. - * - *

{@code subject} can be non-null to satisfy region group requirements, - * otherwise it will be assumed that the caller that is not a member of any - * regions. (Flags on a region can be changed so that they only apply - * to certain users.) The subject argument is required if the - * {@link DefaultFlag#BUILD} flag is in the list of flags.

- * - * @param subject an optional subject, which would be used to determine the region groups that apply - * @param flags a list of flags to check - * @return true if the result was {@code ALLOW} - * @see #queryState(RegionAssociable, StateFlag...) - */ - boolean testState(@Nullable RegionAssociable subject, StateFlag... flags); - - /** - * Get the (effective) value for a list of state flags. The rules of - * states is observed here; that is, {@code DENY} overrides {@code ALLOW}, - * and {@code ALLOW} overrides {@code NONE}. One flag may override another. - * - *

{@code subject} can be non-null to satisfy region group requirements, - * otherwise it will be assumed that the caller that is not a member of any - * regions. (Flags on a region can be changed so that they only apply - * to certain users.) The subject argument is required if the - * {@link DefaultFlag#BUILD} flag is in the list of flags.

- * - * @param subject an optional subject, which would be used to determine the region groups that apply - * @param flags a list of flags to check - * @return a state - */ - @Nullable - State queryState(@Nullable RegionAssociable subject, StateFlag... flags); - - /** - * Get the effective value for a flag. If there are multiple values - * (for example, multiple overlapping regions with - * the same priority may have the same flag set), then the selected - * (or "winning") value will depend on the flag type. - * - *

Only some flag types actually have a strategy for picking the - * "best value." For most types, the actual value that is chosen to be - * returned is undefined (it could be any value). As of writing, the only - * type of flag that actually has a strategy for picking a value is the - * {@link StateFlag}.

- * - *

{@code subject} can be non-null to satisfy region group requirements, - * otherwise it will be assumed that the caller that is not a member of any - * regions. (Flags on a region can be changed so that they only apply - * to certain users.) The subject argument is required if the - * {@link DefaultFlag#BUILD} flag is the flag being queried.

- * - * @param subject an optional subject, which would be used to determine the region group to apply - * @param flag the flag - * @return a value, which could be {@code null} - */ - @Nullable - V queryValue(@Nullable RegionAssociable subject, Flag flag); - - /** - * Get the effective values for a flag, returning a collection of all - * values. It is up to the caller to determine which value, if any, - * from the collection will be used. - * - *

{@code subject} can be non-null to satisfy region group requirements, - * otherwise it will be assumed that the caller that is not a member of any - * regions. (Flags on a region can be changed so that they only apply - * to certain users.) The subject argument is required if the - * {@link DefaultFlag#BUILD} flag is the flag being queried.

- * - * @param subject an optional subject, which would be used to determine the region group to apply - * @param flag the flag - * @return a collection of values - */ - Collection queryAllValues(@Nullable RegionAssociable subject, Flag flag); - - /** - * Test whether the construct flag evaluates true for the given player. - * - * @param player the player - * @return true if true - * @deprecated The {@code CONSTRUCT} flag is being removed and is no longer - * needed because flags now support groups assigned to them. - */ - @Deprecated - boolean canConstruct(LocalPlayer player); - - /** - * Gets the state of a state flag. This cannot be used for the build flag. - * - * @param flag flag to check - * @return whether it is allowed - * @throws IllegalArgumentException if the build flag is given - * @deprecated use {@link #queryState(RegionAssociable, StateFlag...)} instead - */ - @Deprecated - boolean allows(StateFlag flag); - - /** - * Gets the state of a state flag. This cannot be used for the build flag. - * - * @param flag flag to check - * @param player player (used by some flags) - * @return whether the state is allows for it - * @throws IllegalArgumentException if the build flag is given - * @deprecated use {@link #queryState(RegionAssociable, StateFlag...)} instead - */ - @Deprecated - boolean allows(StateFlag flag, @Nullable LocalPlayer player); - - /** - * Test whether a player is an owner of all regions in this set. - * - * @param player the player - * @return whether the player is an owner of all regions - */ - boolean isOwnerOfAll(LocalPlayer player); - - /** - * Test whether a player is an owner or member of all regions in this set. - * - * @param player the player - * @return whether the player is a member of all regions - */ - boolean isMemberOfAll(LocalPlayer player); - - /** - * Gets the value of a flag. Do not use this for state flags - * (use {@link #allows(StateFlag, LocalPlayer)} for that). - * - * @param flag the flag to check - * @return value of the flag, which may be null - * @deprecated Use {@link #queryValue(RegionAssociable, Flag)} instead. There - * is no difference in functionality. - */ - @Deprecated - @Nullable - , V> V getFlag(T flag); - - /** - * Gets the value of a flag. Do not use this for state flags - * (use {@link #allows(StateFlag, LocalPlayer)} for that). - * - * @param flag flag to check - * @param groupPlayer player to check {@link RegionGroup}s against - * @return value of the flag, which may be null - * @throws IllegalArgumentException if a StateFlag is given - * @deprecated Use {@link #queryValue(RegionAssociable, Flag)} instead. There - * is no difference in functionality. - */ - @Deprecated - @Nullable - , V> V getFlag(T flag, @Nullable LocalPlayer groupPlayer); - - /** - * Get the number of regions that are included. - * - * @return the number of contained regions - */ - int size(); - - /** - * Get an immutable set of regions that are included in this set. - * - * @return a set of regions - */ - Set getRegions(); - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.bukkit.RegionQuery; +import com.sk89q.worldguard.protection.association.RegionAssociable; +import com.sk89q.worldguard.protection.flags.DefaultFlag; +import com.sk89q.worldguard.protection.flags.Flag; +import com.sk89q.worldguard.protection.flags.RegionGroup; +import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.flags.StateFlag.State; +import com.sk89q.worldguard.protection.managers.RegionManager; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; + +import javax.annotation.Nullable; +import java.util.Collection; +import java.util.Set; + +/** + * Represents the effective set of flags, owners, and members for a given + * spatial query. + * + *

An instance of this can be created using the spatial query methods + * available on {@link RegionManager}.

+ */ +public interface ApplicableRegionSet extends Iterable { + + /** + * Return whether this region set is a virtual set. A virtual set + * does not contain real results. + * + *

A virtual result may be returned if region data failed to load or + * there was some special exception (i.e. the region bypass permission). + *

+ * + *

Be sure to check the value of this flag if an instance of this + * interface is being retrieved from {@link RegionQuery} as it may + * return an instance of {@link PermissiveRegionSet} or + * {@link FailedLoadRegionSet}, among other possibilities.

+ * + * @return true if loaded + * @see FailedLoadRegionSet + */ + boolean isVirtual(); + + /** + * Tests whether the {@link DefaultFlag#BUILD} flag or membership + * requirements permit the given player. + * + * @param player the player to check + * @return true if permitted + * @deprecated use {@link #testState(RegionAssociable, StateFlag...)} + */ + @Deprecated + boolean canBuild(LocalPlayer player); + + /** + * Test whether the (effective) value for a list of state flags equals + * {@code ALLOW}. + * + *

{@code subject} can be non-null to satisfy region group requirements, + * otherwise it will be assumed that the caller that is not a member of any + * regions. (Flags on a region can be changed so that they only apply + * to certain users.) The subject argument is required if the + * {@link DefaultFlag#BUILD} flag is in the list of flags.

+ * + * @param subject an optional subject, which would be used to determine the region groups that apply + * @param flags a list of flags to check + * @return true if the result was {@code ALLOW} + * @see #queryState(RegionAssociable, StateFlag...) + */ + boolean testState(@Nullable RegionAssociable subject, StateFlag... flags); + + /** + * Get the (effective) value for a list of state flags. The rules of + * states is observed here; that is, {@code DENY} overrides {@code ALLOW}, + * and {@code ALLOW} overrides {@code NONE}. One flag may override another. + * + *

{@code subject} can be non-null to satisfy region group requirements, + * otherwise it will be assumed that the caller that is not a member of any + * regions. (Flags on a region can be changed so that they only apply + * to certain users.) The subject argument is required if the + * {@link DefaultFlag#BUILD} flag is in the list of flags.

+ * + * @param subject an optional subject, which would be used to determine the region groups that apply + * @param flags a list of flags to check + * @return a state + */ + @Nullable + State queryState(@Nullable RegionAssociable subject, StateFlag... flags); + + /** + * Get the effective value for a flag. If there are multiple values + * (for example, multiple overlapping regions with + * the same priority may have the same flag set), then the selected + * (or "winning") value will depend on the flag type. + * + *

Only some flag types actually have a strategy for picking the + * "best value." For most types, the actual value that is chosen to be + * returned is undefined (it could be any value). As of writing, the only + * type of flag that actually has a strategy for picking a value is the + * {@link StateFlag}.

+ * + *

{@code subject} can be non-null to satisfy region group requirements, + * otherwise it will be assumed that the caller that is not a member of any + * regions. (Flags on a region can be changed so that they only apply + * to certain users.) The subject argument is required if the + * {@link DefaultFlag#BUILD} flag is the flag being queried.

+ * + * @param subject an optional subject, which would be used to determine the region group to apply + * @param flag the flag + * @return a value, which could be {@code null} + */ + @Nullable + V queryValue(@Nullable RegionAssociable subject, Flag flag); + + /** + * Get the effective values for a flag, returning a collection of all + * values. It is up to the caller to determine which value, if any, + * from the collection will be used. + * + *

{@code subject} can be non-null to satisfy region group requirements, + * otherwise it will be assumed that the caller that is not a member of any + * regions. (Flags on a region can be changed so that they only apply + * to certain users.) The subject argument is required if the + * {@link DefaultFlag#BUILD} flag is the flag being queried.

+ * + * @param subject an optional subject, which would be used to determine the region group to apply + * @param flag the flag + * @return a collection of values + */ + Collection queryAllValues(@Nullable RegionAssociable subject, Flag flag); + + /** + * Test whether the construct flag evaluates true for the given player. + * + * @param player the player + * @return true if true + * @deprecated The {@code CONSTRUCT} flag is being removed and is no longer + * needed because flags now support groups assigned to them. + */ + @Deprecated + boolean canConstruct(LocalPlayer player); + + /** + * Gets the state of a state flag. This cannot be used for the build flag. + * + * @param flag flag to check + * @return whether it is allowed + * @throws IllegalArgumentException if the build flag is given + * @deprecated use {@link #queryState(RegionAssociable, StateFlag...)} instead + */ + @Deprecated + boolean allows(StateFlag flag); + + /** + * Gets the state of a state flag. This cannot be used for the build flag. + * + * @param flag flag to check + * @param player player (used by some flags) + * @return whether the state is allows for it + * @throws IllegalArgumentException if the build flag is given + * @deprecated use {@link #queryState(RegionAssociable, StateFlag...)} instead + */ + @Deprecated + boolean allows(StateFlag flag, @Nullable LocalPlayer player); + + /** + * Test whether a player is an owner of all regions in this set. + * + * @param player the player + * @return whether the player is an owner of all regions + */ + boolean isOwnerOfAll(LocalPlayer player); + + /** + * Test whether a player is an owner or member of all regions in this set. + * + * @param player the player + * @return whether the player is a member of all regions + */ + boolean isMemberOfAll(LocalPlayer player); + + /** + * Gets the value of a flag. Do not use this for state flags + * (use {@link #allows(StateFlag, LocalPlayer)} for that). + * + * @param flag the flag to check + * @return value of the flag, which may be null + * @deprecated Use {@link #queryValue(RegionAssociable, Flag)} instead. There + * is no difference in functionality. + */ + @Deprecated + @Nullable + , V> V getFlag(T flag); + + /** + * Gets the value of a flag. Do not use this for state flags + * (use {@link #allows(StateFlag, LocalPlayer)} for that). + * + * @param flag flag to check + * @param groupPlayer player to check {@link RegionGroup}s against + * @return value of the flag, which may be null + * @throws IllegalArgumentException if a StateFlag is given + * @deprecated Use {@link #queryValue(RegionAssociable, Flag)} instead. There + * is no difference in functionality. + */ + @Deprecated + @Nullable + , V> V getFlag(T flag, @Nullable LocalPlayer groupPlayer); + + /** + * Get the number of regions that are included. + * + * @return the number of contained regions + */ + int size(); + + /** + * Get an immutable set of regions that are included in this set. + * + * @return a set of regions + */ + Set getRegions(); + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/FailedLoadRegionSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/FailedLoadRegionSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/FailedLoadRegionSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/FailedLoadRegionSet.java diff --git a/src/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/FlagValueCalculator.java diff --git a/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java diff --git a/src/main/java/com/sk89q/worldguard/protection/PermissiveRegionSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/PermissiveRegionSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/PermissiveRegionSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/PermissiveRegionSet.java diff --git a/src/main/java/com/sk89q/worldguard/protection/RegionResultSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/RegionResultSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/RegionResultSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/RegionResultSet.java diff --git a/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java index 21a2ea28..ba2c1492 100644 --- a/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java @@ -1,30 +1,30 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -/** - * Thrown when an intersection between two different types of regions is not - * supported. - * - * @deprecated no longer utilized - */ -@Deprecated -public class UnsupportedIntersectionException extends Exception { -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +/** + * Thrown when an intersection between two different types of regions is not + * supported. + * + * @deprecated no longer utilized + */ +@Deprecated +public class UnsupportedIntersectionException extends Exception { +} diff --git a/src/main/java/com/sk89q/worldguard/protection/association/Associables.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/Associables.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/association/Associables.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/Associables.java diff --git a/src/main/java/com/sk89q/worldguard/protection/association/ConstantAssociation.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/ConstantAssociation.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/association/ConstantAssociation.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/ConstantAssociation.java diff --git a/src/main/java/com/sk89q/worldguard/protection/association/RegionAssociable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/RegionAssociable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/association/RegionAssociable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/RegionAssociable.java diff --git a/src/main/java/com/sk89q/worldguard/protection/association/RegionOverlapAssociation.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/RegionOverlapAssociation.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/association/RegionOverlapAssociation.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/association/RegionOverlapAssociation.java diff --git a/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java index 1726a997..739deabb 100644 --- a/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/events/DisallowedPVPEvent.java @@ -1,81 +1,81 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.events; - -import org.bukkit.entity.Player; -import org.bukkit.event.Cancellable; -import org.bukkit.event.Event; -import org.bukkit.event.HandlerList; - -/** - * This event is fired when PVP is disallowed between players due to a "pvp deny" flag. - * Cancelling this event allows the PVP in spite of this. - * - * @author Score_Under - */ -public class DisallowedPVPEvent extends Event implements Cancellable { - private static final HandlerList handlers = new HandlerList(); - - private boolean cancelled = false; - private final Player attacker; - private final Player defender; - private final Event event; - - public DisallowedPVPEvent(final Player attacker, final Player defender, Event event) { - this.attacker = attacker; - this.defender = defender; - this.event = event; - } - - public boolean isCancelled() { - return cancelled; - } - - public void setCancelled(boolean cancelled) { - this.cancelled = cancelled; - } - - /** - * @return the attacking player. - */ - public Player getAttacker() { - return attacker; - } - - /** - * @return the defending player. - */ - public Player getDefender() { - return defender; - } - - public Event getCause() { - return event; - } - - @Override - public HandlerList getHandlers() { - return handlers; - } - - public static HandlerList getHandlerList() { - return handlers; - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.events; + +import org.bukkit.entity.Player; +import org.bukkit.event.Cancellable; +import org.bukkit.event.Event; +import org.bukkit.event.HandlerList; + +/** + * This event is fired when PVP is disallowed between players due to a "pvp deny" flag. + * Cancelling this event allows the PVP in spite of this. + * + * @author Score_Under + */ +public class DisallowedPVPEvent extends Event implements Cancellable { + private static final HandlerList handlers = new HandlerList(); + + private boolean cancelled = false; + private final Player attacker; + private final Player defender; + private final Event event; + + public DisallowedPVPEvent(final Player attacker, final Player defender, Event event) { + this.attacker = attacker; + this.defender = defender; + this.event = event; + } + + public boolean isCancelled() { + return cancelled; + } + + public void setCancelled(boolean cancelled) { + this.cancelled = cancelled; + } + + /** + * @return the attacking player. + */ + public Player getAttacker() { + return attacker; + } + + /** + * @return the defending player. + */ + public Player getDefender() { + return defender; + } + + public Event getCause() { + return event; + } + + @Override + public HandlerList getHandlers() { + return handlers; + } + + public static HandlerList getHandlerList() { + return handlers; + } +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java index 3568f1d8..22b698e1 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java @@ -1,70 +1,70 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -import org.bukkit.command.CommandSender; - -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; - -/** - * A boolean flag. - */ -public class BooleanFlag extends Flag { - - public BooleanFlag(String name, RegionGroup defaultGroup) { - super(name, defaultGroup); - } - - public BooleanFlag(String name) { - super(name); - } - - @Override - public Boolean parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { - input = input.trim(); - - if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes") - || input.equalsIgnoreCase("on") - || input.equalsIgnoreCase("1")) { - return true; - } else if (input.equalsIgnoreCase("false") || input.equalsIgnoreCase("no") - || input.equalsIgnoreCase("off") - || input.equalsIgnoreCase("0")) { - return false; - } else { - throw new InvalidFlagFormat("Not a yes/no value: " + input); - } - } - - @Override - public Boolean unmarshal(Object o) { - if (o instanceof Boolean) { - return (Boolean) o; - } else { - return null; - } - } - - @Override - public Object marshal(Boolean o) { - return o; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +import org.bukkit.command.CommandSender; + +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; + +/** + * A boolean flag. + */ +public class BooleanFlag extends Flag { + + public BooleanFlag(String name, RegionGroup defaultGroup) { + super(name, defaultGroup); + } + + public BooleanFlag(String name) { + super(name); + } + + @Override + public Boolean parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { + input = input.trim(); + + if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes") + || input.equalsIgnoreCase("on") + || input.equalsIgnoreCase("1")) { + return true; + } else if (input.equalsIgnoreCase("false") || input.equalsIgnoreCase("no") + || input.equalsIgnoreCase("off") + || input.equalsIgnoreCase("0")) { + return false; + } else { + throw new InvalidFlagFormat("Not a yes/no value: " + input); + } + } + + @Override + public Boolean unmarshal(Object o) { + if (o instanceof Boolean) { + return (Boolean) o; + } else { + return null; + } + } + + @Override + public Object marshal(Boolean o) { + return o; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/BuildFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/BuildFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/BuildFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/BuildFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java index 284567ca..a21b8bb2 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java @@ -1,62 +1,62 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -import org.bukkit.command.CommandSender; - -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; - -/** - * Stores a command/ - */ -public class CommandStringFlag extends Flag { - - public CommandStringFlag(String name, RegionGroup defaultGroup) { - super(name, defaultGroup); - } - - public CommandStringFlag(String name) { - super(name); - } - - @Override - public String parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { - input = input.trim(); - if (!input.startsWith("/")) { - input = "/" + input; - } - return input.toLowerCase(); - } - - @Override - public String unmarshal(Object o) { - if (o instanceof String) { - return (String) o; - } else { - return null; - } - } - - @Override - public Object marshal(String o) { - return o; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +import org.bukkit.command.CommandSender; + +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; + +/** + * Stores a command/ + */ +public class CommandStringFlag extends Flag { + + public CommandStringFlag(String name, RegionGroup defaultGroup) { + super(name, defaultGroup); + } + + public CommandStringFlag(String name) { + super(name); + } + + @Override + public String parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { + input = input.trim(); + if (!input.startsWith("/")) { + input = "/" + input; + } + return input.toLowerCase(); + } + + @Override + public String unmarshal(Object o) { + if (o instanceof String) { + return (String) o; + } else { + return null; + } + } + + @Override + public Object marshal(String o) { + return o; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java index daf36290..79f0d605 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java @@ -1,53 +1,53 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -import org.bukkit.entity.EntityType; - -/** - * Stores an entity type. - */ -public class EntityTypeFlag extends EnumFlag { - - public EntityTypeFlag(String name, RegionGroup defaultGroup) { - super(name, EntityType.class, defaultGroup); - } - - public EntityTypeFlag(String name) { - super(name, EntityType.class); - } - - @Override - public EntityType detectValue(String input) { - EntityType lowMatch = null; - - for (EntityType type : EntityType.values()) { - if (type.name().equalsIgnoreCase(input.trim())) { - return type; - } - - if (type.name().toLowerCase().startsWith(input.toLowerCase().trim())) { - lowMatch = type; - } - } - - return lowMatch; - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +import org.bukkit.entity.EntityType; + +/** + * Stores an entity type. + */ +public class EntityTypeFlag extends EnumFlag { + + public EntityTypeFlag(String name, RegionGroup defaultGroup) { + super(name, EntityType.class, defaultGroup); + } + + public EntityTypeFlag(String name) { + super(name, EntityType.class); + } + + @Override + public EntityType detectValue(String input) { + EntityType lowMatch = null; + + for (EntityType type : EntityType.values()) { + if (type.name().equalsIgnoreCase(input.trim())) { + return type; + } + + if (type.name().toLowerCase().startsWith(input.toLowerCase().trim())) { + lowMatch = type; + } + } + + return lowMatch; + } +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java index 4f7a4dd9..d8c12c2b 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java @@ -1,104 +1,104 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -import org.bukkit.command.CommandSender; - -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; - -/** - * Stores an enum value. - */ -public class EnumFlag> extends Flag { - - private Class enumClass; - - public EnumFlag(String name, Class enumClass, RegionGroup defaultGroup) { - super(name, defaultGroup); - this.enumClass = enumClass; - } - - public EnumFlag(String name, Class enumClass) { - super(name); - this.enumClass = enumClass; - } - - /** - * Get the enum class. - * - * @return the enum class - */ - public Class getEnumClass() { - return enumClass; - } - - private T findValue(String input) throws IllegalArgumentException { - if (input != null) { - input = input.toUpperCase(); - } - - try { - return Enum.valueOf(enumClass, input); - } catch (IllegalArgumentException e) { - T val = detectValue(input); - - if (val != null) { - return val; - } - - throw e; - } - } - - /** - * Fuzzy detect the value if the value is not found. - * - * @param input string input - * @return value or null - */ - public T detectValue(String input) { - return null; - } - - @Override - public T parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { - try { - return findValue(input); - } catch (IllegalArgumentException e) { - throw new InvalidFlagFormat("Unknown value '" + input + "' in " - + enumClass.getName()); - } - } - - @Override - public T unmarshal(Object o) { - try { - return Enum.valueOf(enumClass, String.valueOf(o)); - } catch (IllegalArgumentException e) { - return null; - } - } - - @Override - public Object marshal(T o) { - return o.name(); - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +import org.bukkit.command.CommandSender; + +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; + +/** + * Stores an enum value. + */ +public class EnumFlag> extends Flag { + + private Class enumClass; + + public EnumFlag(String name, Class enumClass, RegionGroup defaultGroup) { + super(name, defaultGroup); + this.enumClass = enumClass; + } + + public EnumFlag(String name, Class enumClass) { + super(name); + this.enumClass = enumClass; + } + + /** + * Get the enum class. + * + * @return the enum class + */ + public Class getEnumClass() { + return enumClass; + } + + private T findValue(String input) throws IllegalArgumentException { + if (input != null) { + input = input.toUpperCase(); + } + + try { + return Enum.valueOf(enumClass, input); + } catch (IllegalArgumentException e) { + T val = detectValue(input); + + if (val != null) { + return val; + } + + throw e; + } + } + + /** + * Fuzzy detect the value if the value is not found. + * + * @param input string input + * @return value or null + */ + public T detectValue(String input) { + return null; + } + + @Override + public T parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { + try { + return findValue(input); + } catch (IllegalArgumentException e) { + throw new InvalidFlagFormat("Unknown value '" + input + "' in " + + enumClass.getName()); + } + } + + @Override + public T unmarshal(Object o) { + try { + return Enum.valueOf(enumClass, String.valueOf(o)); + } catch (IllegalArgumentException e) { + return null; + } + } + + @Override + public Object marshal(T o) { + return o.name(); + } + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/Flag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java similarity index 97% rename from src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java index d49778eb..d5d2d46a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java @@ -1,29 +1,29 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -public class InvalidFlagFormat extends Exception { - - private static final long serialVersionUID = 8101615074524004172L; - - public InvalidFlagFormat(String msg) { - super(msg); - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +public class InvalidFlagFormat extends Exception { + + private static final long serialVersionUID = 8101615074524004172L; + + public InvalidFlagFormat(String msg) { + super(msg); + } +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/LazyLocation.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/LazyLocation.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/LazyLocation.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/LazyLocation.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroup.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java index c5b41155..da0957f2 100644 --- a/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java @@ -1,102 +1,102 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.flags; - -import com.google.common.collect.Sets; -import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import org.bukkit.command.CommandSender; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -/** - * Stores a set of types. - */ -public class SetFlag extends Flag> { - - private Flag subFlag; - - public SetFlag(String name, RegionGroup defaultGroup, Flag subFlag) { - super(name, defaultGroup); - this.subFlag = subFlag; - } - - public SetFlag(String name, Flag subFlag) { - super(name); - this.subFlag = subFlag; - } - - /** - * Get the flag that is stored in this flag. - * - * @return the stored flag type - */ - public Flag getType() { - return subFlag; - } - - @Override - public Set parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { - if (input.isEmpty()) { - return Sets.newHashSet(); - } else { - Set items = Sets.newHashSet(); - - for (String str : input.split(",")) { - items.add(subFlag.parseInput(plugin, sender, str.trim())); - } - - return items; - } - } - - @Override - public Set unmarshal(Object o) { - if (o instanceof Collection) { - Collection collection = (Collection) o; - Set items = new HashSet(); - - for (Object sub : collection) { - T item = subFlag.unmarshal(sub); - if (item != null) { - items.add(item); - } - } - - return items; - } else { - return null; - } - } - - @Override - public Object marshal(Set o) { - List list = new ArrayList(); - for (T item : o) { - list.add(subFlag.marshal(item)); - } - - return list; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.flags; + +import com.google.common.collect.Sets; +import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import org.bukkit.command.CommandSender; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * Stores a set of types. + */ +public class SetFlag extends Flag> { + + private Flag subFlag; + + public SetFlag(String name, RegionGroup defaultGroup, Flag subFlag) { + super(name, defaultGroup); + this.subFlag = subFlag; + } + + public SetFlag(String name, Flag subFlag) { + super(name); + this.subFlag = subFlag; + } + + /** + * Get the flag that is stored in this flag. + * + * @return the stored flag type + */ + public Flag getType() { + return subFlag; + } + + @Override + public Set parseInput(WorldGuardPlugin plugin, CommandSender sender, String input) throws InvalidFlagFormat { + if (input.isEmpty()) { + return Sets.newHashSet(); + } else { + Set items = Sets.newHashSet(); + + for (String str : input.split(",")) { + items.add(subFlag.parseInput(plugin, sender, str.trim())); + } + + return items; + } + } + + @Override + public Set unmarshal(Object o) { + if (o instanceof Collection) { + Collection collection = (Collection) o; + Set items = new HashSet(); + + for (Object sub : collection) { + T item = subFlag.unmarshal(sub); + if (item != null) { + items.add(item); + } + } + + return items; + } else { + return null; + } + } + + @Override + public Object marshal(Set o) { + List list = new ArrayList(); + for (T item : o) { + list.add(subFlag.marshal(item)); + } + + return list; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/RegionContainerImpl.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionContainerImpl.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/RegionContainerImpl.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionContainerImpl.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/RegionDifference.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionDifference.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/RegionDifference.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionDifference.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/RemovalStrategy.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RemovalStrategy.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/RemovalStrategy.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/RemovalStrategy.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/AbstractRegionIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/AbstractRegionIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/AbstractRegionIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/AbstractRegionIndex.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/ConcurrentRegionIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/ConcurrentRegionIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/ConcurrentRegionIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/ConcurrentRegionIndex.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/HashMapIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/HashMapIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/HashMapIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/HashMapIndex.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/index/RegionIndex.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/RegionIndex.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/index/RegionIndex.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/index/RegionIndex.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/migration/AbstractMigration.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/AbstractMigration.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/migration/AbstractMigration.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/AbstractMigration.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/migration/DriverMigration.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/DriverMigration.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/migration/DriverMigration.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/DriverMigration.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/migration/Migration.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/Migration.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/migration/Migration.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/Migration.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/migration/MigrationException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/MigrationException.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/migration/MigrationException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/MigrationException.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/migration/UUIDMigration.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/DifferenceSaveException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/DifferenceSaveException.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/DifferenceSaveException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/DifferenceSaveException.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/DriverType.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/DriverType.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/DriverType.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/DriverType.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/MemoryRegionDatabase.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/MemoryRegionDatabase.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/MemoryRegionDatabase.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/MemoryRegionDatabase.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabase.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabase.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabase.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabase.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabaseUtils.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabaseUtils.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabaseUtils.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDatabaseUtils.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDriver.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDriver.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDriver.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/RegionDriver.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/StorageException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/StorageException.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/StorageException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/StorageException.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/DirectoryYamlDriver.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/DirectoryYamlDriver.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/file/DirectoryYamlDriver.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/DirectoryYamlDriver.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataLoader.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataLoader.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataLoader.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataLoader.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataUpdater.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataUpdater.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataUpdater.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DataUpdater.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DomainTableCache.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DomainTableCache.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DomainTableCache.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/DomainTableCache.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionRemover.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionRemover.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionRemover.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionRemover.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionUpdater.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionUpdater.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionUpdater.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionUpdater.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLDriver.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLDriver.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLDriver.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLDriver.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/SQLRegionDatabase.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/StatementBatch.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/StatementBatch.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/StatementBatch.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/StatementBatch.java diff --git a/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/TableCache.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/TableCache.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/TableCache.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/TableCache.java diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java similarity index 96% rename from src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java index 06b10546..033bfc5a 100644 --- a/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java @@ -1,92 +1,92 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection.regions; - -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.BlockVector2D; -import com.sk89q.worldedit.Vector; - -import java.awt.geom.Area; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; - -/** - * A special region that is not quite "anywhere" (its volume is 0, it - * contains no positions, and it does not intersect with any other region). - * - *

Global regions, however, are used to specify a region with flags that - * are applied with the lowest priority.

- */ -public class GlobalProtectedRegion extends ProtectedRegion { - - /** - * Create a new instance. - * - * @param id the ID - */ - public GlobalProtectedRegion(String id) { - super(id); - min = new BlockVector(0, 0, 0); - max = new BlockVector(0, 0, 0); - } - - @Override - public boolean isPhysicalArea() { - return false; - } - - @Override - public List getPoints() { - // This doesn't make sense - List pts = new ArrayList(); - pts.add(new BlockVector2D(min.getBlockX(), min.getBlockZ())); - return pts; - } - - @Override - public int volume() { - return 0; - } - - @Override - public boolean contains(Vector pt) { - // Global regions are handled separately so it must not contain any positions - return false; - } - - @Override - public RegionType getType() { - return RegionType.GLOBAL; - } - - @Override - public List getIntersectingRegions(Collection regions) { - // Global regions are handled separately so it must not contain any positions - return Collections.emptyList(); - } - - @Override - Area toArea() { - return null; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection.regions; + +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.BlockVector2D; +import com.sk89q.worldedit.Vector; + +import java.awt.geom.Area; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +/** + * A special region that is not quite "anywhere" (its volume is 0, it + * contains no positions, and it does not intersect with any other region). + * + *

Global regions, however, are used to specify a region with flags that + * are applied with the lowest priority.

+ */ +public class GlobalProtectedRegion extends ProtectedRegion { + + /** + * Create a new instance. + * + * @param id the ID + */ + public GlobalProtectedRegion(String id) { + super(id); + min = new BlockVector(0, 0, 0); + max = new BlockVector(0, 0, 0); + } + + @Override + public boolean isPhysicalArea() { + return false; + } + + @Override + public List getPoints() { + // This doesn't make sense + List pts = new ArrayList(); + pts.add(new BlockVector2D(min.getBlockX(), min.getBlockZ())); + return pts; + } + + @Override + public int volume() { + return 0; + } + + @Override + public boolean contains(Vector pt) { + // Global regions are handled separately so it must not contain any positions + return false; + } + + @Override + public RegionType getType() { + return RegionType.GLOBAL; + } + + @Override + public List getIntersectingRegions(Collection regions) { + // Global regions are handled separately so it must not contain any positions + return Collections.emptyList(); + } + + @Override + Area toArea() { + return null; + } + +} diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java diff --git a/src/main/java/com/sk89q/worldguard/protection/regions/RegionType.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/RegionType.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/regions/RegionType.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/regions/RegionType.java diff --git a/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java diff --git a/src/main/java/com/sk89q/worldguard/protection/util/NormativeOrders.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/NormativeOrders.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/util/NormativeOrders.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/NormativeOrders.java diff --git a/src/main/java/com/sk89q/worldguard/protection/util/RegionCollectionConsumer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/RegionCollectionConsumer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/util/RegionCollectionConsumer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/RegionCollectionConsumer.java diff --git a/src/main/java/com/sk89q/worldguard/protection/util/UnresolvedNamesException.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/UnresolvedNamesException.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/protection/util/UnresolvedNamesException.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/protection/util/UnresolvedNamesException.java diff --git a/src/main/java/com/sk89q/worldguard/session/MoveType.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/MoveType.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/MoveType.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/MoveType.java diff --git a/src/main/java/com/sk89q/worldguard/session/Session.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/Session.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/Session.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/Session.java diff --git a/src/main/java/com/sk89q/worldguard/session/SessionManager.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/SessionManager.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/SessionManager.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/SessionManager.java diff --git a/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/WorldPlayerTuple.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/FeedFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FeedFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/FeedFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FeedFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/FlagValueChangeHandler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FlagValueChangeHandler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/FlagValueChangeHandler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/FlagValueChangeHandler.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GameModeFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/GodMode.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GodMode.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/GodMode.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GodMode.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/Handler.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/Handler.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/Handler.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/Handler.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/HealFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/HealFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/HealFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/HealFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/InvincibilityFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/InvincibilityFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/InvincibilityFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/InvincibilityFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/NotifyEntryFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/NotifyEntryFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/NotifyEntryFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/NotifyEntryFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/NotifyExitFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/NotifyExitFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/NotifyExitFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/NotifyExitFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/TimeLockFlag.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/WaterBreathing.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/WaterBreathing.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/WaterBreathing.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/WaterBreathing.java diff --git a/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/session/handler/WeatherLockFlag.java diff --git a/src/main/java/com/sk89q/worldguard/util/ChangeTracked.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/ChangeTracked.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/ChangeTracked.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/ChangeTracked.java diff --git a/src/main/java/com/sk89q/worldguard/util/Enums.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/Enums.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/Enums.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/Enums.java diff --git a/src/main/java/com/sk89q/worldguard/util/MathUtils.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/MathUtils.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/MathUtils.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/MathUtils.java diff --git a/src/main/java/com/sk89q/worldguard/util/Normal.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/Normal.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/Normal.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/Normal.java diff --git a/src/main/java/com/sk89q/worldguard/util/collect/EntryBase.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/EntryBase.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/collect/EntryBase.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/EntryBase.java diff --git a/src/main/java/com/sk89q/worldguard/util/collect/LongBaseHashTable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongBaseHashTable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/collect/LongBaseHashTable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongBaseHashTable.java diff --git a/src/main/java/com/sk89q/worldguard/util/collect/LongHash.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHash.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/collect/LongHash.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHash.java diff --git a/src/main/java/com/sk89q/worldguard/util/collect/LongHashSet.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHashSet.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/collect/LongHashSet.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHashSet.java diff --git a/src/main/java/com/sk89q/worldguard/util/collect/LongHashTable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHashTable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/collect/LongHashTable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/collect/LongHashTable.java diff --git a/src/main/java/com/sk89q/worldguard/util/command/CommandFilter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/command/CommandFilter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/command/CommandFilter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/command/CommandFilter.java diff --git a/src/main/java/com/sk89q/worldguard/util/concurrent/EvenMoreExecutors.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/concurrent/EvenMoreExecutors.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/concurrent/EvenMoreExecutors.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/concurrent/EvenMoreExecutors.java diff --git a/src/main/java/com/sk89q/worldguard/util/io/Closer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/io/Closer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/io/Closer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/io/Closer.java diff --git a/src/main/java/com/sk89q/worldguard/util/logging/ClassSourceValidator.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/logging/ClassSourceValidator.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/logging/ClassSourceValidator.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/logging/ClassSourceValidator.java diff --git a/src/main/java/com/sk89q/worldguard/util/logging/RecordMessagePrefixer.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/logging/RecordMessagePrefixer.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/logging/RecordMessagePrefixer.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/logging/RecordMessagePrefixer.java diff --git a/src/main/java/com/sk89q/worldguard/util/net/HttpRequest.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/net/HttpRequest.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/net/HttpRequest.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/net/HttpRequest.java diff --git a/src/main/java/com/sk89q/worldguard/util/paste/EngineHubPaste.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/EngineHubPaste.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/paste/EngineHubPaste.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/EngineHubPaste.java diff --git a/src/main/java/com/sk89q/worldguard/util/paste/Pastebin.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Pastebin.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/paste/Pastebin.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Pastebin.java diff --git a/src/main/java/com/sk89q/worldguard/util/paste/Paster.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Paster.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/paste/Paster.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Paster.java diff --git a/src/main/java/com/sk89q/worldguard/util/paste/Pasters.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Pasters.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/paste/Pasters.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/paste/Pasters.java diff --git a/src/main/java/com/sk89q/worldguard/util/profiler/SamplerBuilder.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/SamplerBuilder.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/profiler/SamplerBuilder.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/SamplerBuilder.java diff --git a/src/main/java/com/sk89q/worldguard/util/profiler/StackNode.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/StackNode.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/profiler/StackNode.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/StackNode.java diff --git a/src/main/java/com/sk89q/worldguard/util/profiler/StackTraceNode.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/StackTraceNode.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/profiler/StackTraceNode.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/StackTraceNode.java diff --git a/src/main/java/com/sk89q/worldguard/util/profiler/ThreadIdFilter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/ThreadIdFilter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/profiler/ThreadIdFilter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/ThreadIdFilter.java diff --git a/src/main/java/com/sk89q/worldguard/util/profiler/ThreadNameFilter.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/ThreadNameFilter.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/profiler/ThreadNameFilter.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/profiler/ThreadNameFilter.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/CancelReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/CancelReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/CancelReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/CancelReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/DataReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/DataReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/DataReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/DataReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/RegionReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/RegionReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/Report.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/Report.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/Report.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/Report.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/ReportList.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/ReportList.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/ReportList.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/ReportList.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/ShallowObjectReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/ShallowObjectReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/ShallowObjectReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/ShallowObjectReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/StackTraceReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/StackTraceReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/StackTraceReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/StackTraceReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/SystemInfoReport.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/SystemInfoReport.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/SystemInfoReport.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/SystemInfoReport.java diff --git a/src/main/java/com/sk89q/worldguard/util/report/Unreported.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/Unreported.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/report/Unreported.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/report/Unreported.java diff --git a/src/main/java/com/sk89q/worldguard/util/sql/DataSourceConfig.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/sql/DataSourceConfig.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/sql/DataSourceConfig.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/sql/DataSourceConfig.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/AbstractTask.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/AbstractTask.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/AbstractTask.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/AbstractTask.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/FutureForwardingTask.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/FutureForwardingTask.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/FutureForwardingTask.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/FutureForwardingTask.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/SimpleSupervisor.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/SimpleSupervisor.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/SimpleSupervisor.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/SimpleSupervisor.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/Supervisor.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/Supervisor.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/Supervisor.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/Supervisor.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/Task.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/Task.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/Task.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/Task.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/TaskStateComparator.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/TaskStateComparator.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/TaskStateComparator.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/TaskStateComparator.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/progress/Progress.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/Progress.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/progress/Progress.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/Progress.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressIterator.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressIterator.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/progress/ProgressIterator.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressIterator.java diff --git a/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressObservable.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressObservable.java similarity index 100% rename from src/main/java/com/sk89q/worldguard/util/task/progress/ProgressObservable.java rename to worldguard-legacy/src/main/java/com/sk89q/worldguard/util/task/progress/ProgressObservable.java diff --git a/worldguard-legacy/src/main/resources/defaults/blacklist.txt b/worldguard-legacy/src/main/resources/defaults/blacklist.txt new file mode 100644 index 00000000..8ed6e0de --- /dev/null +++ b/worldguard-legacy/src/main/resources/defaults/blacklist.txt @@ -0,0 +1,65 @@ +# +# WorldGuard blacklist +# +# The blacklist lets you block actions, blocks, and items from being used. +# You choose a set of "items to affect" and a list of "actions to perform." +# +############################################################################### +# +# Example to block some ore mining and placement: +# [coalore,goldore,ironore] +# on-break=deny,log,kick +# on-place=deny,tell +# +# Events that you can detect: +# - on-break (when a block of this type is about to be broken) +# - on-destroy-with (the item/block held by the user while destroying) +# - on-place (a block is being placed) +# - on-use (an item like flint and steel or a bucket is being used) +# - on-interact (when a block in used (doors, chests, etc.)) +# - on-drop (an item is being dropped from the player's inventory) +# - on-acquire (an item enters a player's inventory via some method) +# - on-dispense (a dispenser is about to dispense an item) +# +# Actions (for events): +# - deny (deny completely, used blacklist mode) +# - allow (used in whitelist mode) +# - notify (notify admins with the 'worldguard.notify' permission) +# - log (log to console/file/database) +# - tell (tell a player that that's not allowed) +# - kick (kick player) +# - ban (ban player) +# +# Options: +# - ignore-groups (comma-separated list of groups to not affect) +# - ignore-perms (comma-separated list of permissions to not affect - make up +# your very own permissions!) +# - comment (message for yourself that is printed with 'log' and 'notify') +# - message (optional message to show the user instead; %s is the item name) +# +############################################################################### +# +# For more information, see: +# http://wiki.sk89q.com/wiki/WorldGuard/Blacklist +# +############################################################################### +# +# Some examples follow. +# REMEMBER: If a line has # in front, it will be ignored. +# + +# Deny lava buckets +#[lavabucket] +#ignore-perms=my.own.madeup.permission +#ignore-groups=admins,mods +#on-use=deny,tell + +# Deny some ore +#[coalore,goldore,ironore] +#ignore-groups=admins,mods +#on-break=notify,deny,log + +# Some funky data value tests +#[wood:0;>=2] +#ignore-groups=admins,mods +#on-break=notify,deny,log \ No newline at end of file diff --git a/worldguard-legacy/src/main/resources/defaults/config.yml b/worldguard-legacy/src/main/resources/defaults/config.yml new file mode 100644 index 00000000..4501e6fb --- /dev/null +++ b/worldguard-legacy/src/main/resources/defaults/config.yml @@ -0,0 +1,22 @@ +# +# WorldGuard's configuration file +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are commentsand so they are ignored. +# +# WARNING: +# Remember to check the compatibility spreadsheet for WorldGuard to see +# if any features are currently broken in your version of Bukkit. +# + +# -- This should be automatically replaced by the plugin in-game -- \ No newline at end of file diff --git a/worldguard-legacy/src/main/resources/defaults/config_world.yml b/worldguard-legacy/src/main/resources/defaults/config_world.yml new file mode 100644 index 00000000..db29fa3a --- /dev/null +++ b/worldguard-legacy/src/main/resources/defaults/config_world.yml @@ -0,0 +1,21 @@ +# +# WorldGuard's configuration file. +# +# This is the a per-world configuration file. It only affects one +# corresponding world. +# +# About editing this file: +# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If +# you use an editor like Notepad++ (recommended for Windows users), you +# must configure it to "replace tabs with spaces." In Notepad++, this can +# be changed in Settings > Preferences > Language Menu. +# - Don't get rid of the indents. They are indented so some entries are +# in categories (like "enforce-single-session" is in the "protection" +# category. +# - If you want to check the format of this file before putting it +# into WorldGuard, paste it into http://yaml-online-parser.appspot.com/ +# and see if it gives "ERROR:". +# - Lines starting with # are comments and so they are ignored. +# + +# -- This should be automatically replaced by the plugin in-game -- \ No newline at end of file diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql b/worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql new file mode 100644 index 00000000..985b173f --- /dev/null +++ b/worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql @@ -0,0 +1,212 @@ +SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0; +SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0; +SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='TRADITIONAL'; + +-- ----------------------------------------------------- +-- Table `group` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}group` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , + `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + PRIMARY KEY (`id`) , + UNIQUE INDEX `name` (`name` ASC) ) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `world` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}world` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , + `name` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + PRIMARY KEY (`id`) , + UNIQUE INDEX `name` (`name` ASC) ) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region` ( + `id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `type` ENUM('cuboid','poly2d','global') CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `priority` SMALLINT(6) NOT NULL DEFAULT '0' , + `parent` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NULL DEFAULT NULL , + PRIMARY KEY (`id`, `world_id`) , + INDEX `fk_region_world` (`world_id` ASC) , + INDEX `parent` (`parent` ASC) , + CONSTRAINT `fk_${tablePrefix}region_world1` + FOREIGN KEY (`world_id` ) + REFERENCES `${tablePrefix}world` (`id` ) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `${tablePrefix}parent` + FOREIGN KEY (`parent` ) + REFERENCES `${tablePrefix}region` (`id` ) + ON DELETE SET NULL + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_cuboid` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_cuboid` ( + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `min_x` BIGINT(20) NOT NULL , + `min_y` BIGINT(20) NOT NULL , + `min_z` BIGINT(20) NOT NULL , + `max_x` BIGINT(20) NOT NULL , + `max_y` BIGINT(20) NOT NULL , + `max_z` BIGINT(20) NOT NULL , + PRIMARY KEY (`region_id`, `world_id`) , + INDEX `fk_region_cuboid_region` (`region_id` ASC) , + CONSTRAINT `fk_${tablePrefix}region_cuboid_region` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region` (`id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_flag` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_flag` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `flag` VARCHAR(45) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `value` VARCHAR(256) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + PRIMARY KEY (`id`) , + INDEX `fk_flags_region` (`region_id` ASC, `world_id` ASC) , + CONSTRAINT `fk_${tablePrefix}flags_region` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region` (`id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_groups` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_groups` ( + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `group_id` INT(10) UNSIGNED NOT NULL , + `owner` TINYINT(1) NOT NULL , + PRIMARY KEY (`region_id`, `world_id`, `group_id`) , + INDEX `fk_region_groups_region` (`region_id` ASC) , + INDEX `fk_region_groups_group` (`group_id` ASC) , + CONSTRAINT `fk_${tablePrefix}region_groups_group` + FOREIGN KEY (`group_id` ) + REFERENCES `${tablePrefix}group` (`id` ) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_${tablePrefix}region_groups_region` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region` (`id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `user` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}user` ( + `id` INT(10) UNSIGNED NOT NULL AUTO_INCREMENT , + `name` VARCHAR(64) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + PRIMARY KEY (`id`) , + UNIQUE INDEX `name` (`name` ASC) ) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_players` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_players` ( + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `user_id` INT(10) UNSIGNED NOT NULL , + `owner` TINYINT(1) NOT NULL , + PRIMARY KEY (`region_id`, `world_id`, `user_id`) , + INDEX `fk_region_players_region` (`region_id` ASC) , + INDEX `fk_region_users_user` (`user_id` ASC) , + CONSTRAINT `fk_${tablePrefix}region_users_region` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region` (`id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE, + CONSTRAINT `fk_${tablePrefix}region_users_user` + FOREIGN KEY (`user_id` ) + REFERENCES `${tablePrefix}user` (`id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_poly2d` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_poly2d` ( + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `min_y` INT(11) NOT NULL , + `max_y` INT(11) NOT NULL , + PRIMARY KEY (`region_id`, `world_id`) , + INDEX `fk_region_poly2d_region` (`region_id` ASC) , + CONSTRAINT `fk_${tablePrefix}region_poly2d_region` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region` (`id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + +-- ----------------------------------------------------- +-- Table `region_poly2d_point` +-- ----------------------------------------------------- +CREATE TABLE IF NOT EXISTS `${tablePrefix}region_poly2d_point` ( + `id` BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT , + `region_id` VARCHAR(128) CHARACTER SET 'utf8' COLLATE 'utf8_bin' NOT NULL , + `world_id` INT(10) UNSIGNED NOT NULL , + `x` BIGINT(20) NOT NULL , + `z` BIGINT(20) NOT NULL , + PRIMARY KEY (`id`) , + INDEX `fk_region_poly2d_point_region_poly2d` (`region_id` ASC, `world_id` ASC) , + CONSTRAINT `fk_${tablePrefix}region_poly2d_point_region_poly2d` + FOREIGN KEY (`region_id` , `world_id` ) + REFERENCES `${tablePrefix}region_poly2d` (`region_id` , `world_id` ) + ON DELETE CASCADE + ON UPDATE CASCADE) +ENGINE = InnoDB +DEFAULT CHARACTER SET = utf8 +COLLATE = utf8_bin; + + + +SET SQL_MODE=@OLD_SQL_MODE; +SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS; +SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS; diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql b/worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql new file mode 100644 index 00000000..b1df899f --- /dev/null +++ b/worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql @@ -0,0 +1,27 @@ +-- Fix WORLDGUARD-3117 +-- Otherwise, you can't be both an owner and a member of a region + +ALTER TABLE `${tablePrefix}region_players` + DROP PRIMARY KEY, + ADD PRIMARY KEY (`region_id`, `world_id`, `user_id`, `owner`); + +ALTER TABLE `${tablePrefix}region_groups` + DROP PRIMARY KEY, + ADD PRIMARY KEY (`region_id`, `world_id`, `group_id`, `owner`); + +-- Fix WORLDGUARD-3030 +-- Adds UUID support + +ALTER TABLE `${tablePrefix}user` + ALTER `name` DROP DEFAULT; + +ALTER TABLE `${tablePrefix}user` + CHANGE COLUMN `name` `name` VARCHAR(64) NULL COLLATE 'utf8_bin' AFTER `id`, + ADD COLUMN `uuid` CHAR(36) NULL AFTER `name`, + ADD UNIQUE INDEX `uuid` (`uuid`); + +-- Strings with differing numbers of trailing spaces are equal in MySQL +-- The domains have been updated to trim strings + +UPDATE `${tablePrefix}user` SET `name` = TRIM(`name`); +UPDATE `${tablePrefix}group` SET `name` = TRIM(`name`); \ No newline at end of file diff --git a/worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql b/worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql new file mode 100644 index 00000000..2b5b99e3 --- /dev/null +++ b/worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql @@ -0,0 +1,160 @@ + +CREATE TABLE "${tablePrefix}world" ( + id INTEGER PRIMARY KEY AUTOINCREMENT + NOT NULL, + name TEXT NOT NULL + UNIQUE +); + + +CREATE TABLE "${tablePrefix}region" ( + id TEXT NOT NULL, + world_id INTEGER NOT NULL + REFERENCES "${tablePrefix}world" ( id ) ON DELETE CASCADE + ON UPDATE CASCADE, + type TEXT NOT NULL, + priority INTEGER NOT NULL, + parent TEXT DEFAULT ( NULL ) + --REFERENCES "${tablePrefix}region" ( id ) ON DELETE SET NULL + -- ON UPDATE CASCADE -- Not supported + , + PRIMARY KEY ( id, world_id ) +); + + +CREATE TABLE "${tablePrefix}user" ( + id INTEGER PRIMARY KEY AUTOINCREMENT + NOT NULL, + name TEXT UNIQUE + DEFAULT ( NULL ), + uuid TEXT UNIQUE + DEFAULT ( NULL ) +); + + +CREATE TABLE "${tablePrefix}group" ( + id INTEGER PRIMARY KEY AUTOINCREMENT + NOT NULL, + name TEXT NOT NULL + UNIQUE +); + + +CREATE TABLE "${tablePrefix}region_cuboid" ( + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + min_x INTEGER NOT NULL, + min_y INTEGER NOT NULL, + min_z INTEGER NOT NULL, + max_x INTEGER NOT NULL, + max_y INTEGER NOT NULL, + max_z INTEGER NOT NULL, + PRIMARY KEY ( region_id, world_id ), + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region" ( id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE TABLE "${tablePrefix}region_poly2d" ( + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + min_y INTEGER NOT NULL, + max_y INTEGER NOT NULL, + PRIMARY KEY ( region_id, world_id ), + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region" ( id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE TABLE "${tablePrefix}region_poly2d_point" ( + id INTEGER PRIMARY KEY AUTOINCREMENT + NOT NULL, + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + x INTEGER NOT NULL, + z INTEGER NOT NULL, + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region_poly2d" ( region_id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE TABLE "${tablePrefix}region_groups" ( + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + group_id INTEGER NOT NULL + REFERENCES "${tablePrefix}group" ( id ) ON DELETE CASCADE + ON UPDATE CASCADE, + owner BOOLEAN NOT NULL, + PRIMARY KEY ( region_id, world_id, group_id ), + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region" ( id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE TABLE "${tablePrefix}region_flag" ( + id INTEGER PRIMARY KEY AUTOINCREMENT + NOT NULL, + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + flag TEXT NOT NULL, + value TEXT NOT NULL, + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region" ( id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE TABLE "${tablePrefix}region_players" ( + region_id TEXT NOT NULL, + world_id INTEGER NOT NULL, + user_id INTEGER NOT NULL + REFERENCES "${tablePrefix}user" ( id ) ON DELETE CASCADE + ON UPDATE CASCADE, + owner BOOLEAN NOT NULL, + PRIMARY KEY ( region_id, world_id, user_id, owner ), + FOREIGN KEY ( region_id, world_id ) REFERENCES "${tablePrefix}region" ( id, world_id ) ON DELETE CASCADE + ON UPDATE CASCADE +); + + +CREATE INDEX "idx_${tablePrefix}region_cuboid_region_id" ON "${tablePrefix}region_cuboid" ( + region_id +); + + +CREATE INDEX "idx_${tablePrefix}region_world_id" ON "${tablePrefix}region" ( + world_id +); + + +CREATE INDEX "idx_${tablePrefix}region_parent" ON "${tablePrefix}region" ( + parent +); + + +CREATE INDEX "idx_${tablePrefix}region_poly2d_region_id" ON "${tablePrefix}region_poly2d" ( + region_id +); + + +CREATE INDEX "idx_${tablePrefix}region_poly2d_point_region_world_id" ON "${tablePrefix}region_poly2d_point" ( + region_id, + world_id +); + + +CREATE INDEX "idx_${tablePrefix}region_groups_region_id" ON "${tablePrefix}region_groups" ( + region_id +); + + +CREATE INDEX "idx_${tablePrefix}region_groups_group_id" ON "${tablePrefix}region_groups" ( + group_id +); + + +CREATE INDEX "idx_${tablePrefix}region_flag_region_world_id" ON "${tablePrefix}region_flag" ( + region_id, + world_id, + flag +); + diff --git a/worldguard-legacy/src/main/resources/plugin.yml b/worldguard-legacy/src/main/resources/plugin.yml new file mode 100644 index 00000000..b0aacf55 --- /dev/null +++ b/worldguard-legacy/src/main/resources/plugin.yml @@ -0,0 +1,4 @@ +name: WorldGuard +main: com.sk89q.worldguard.bukkit.WorldGuardPlugin +version: "${project.version}" +softdepend: [WorldEdit, CommandBook] diff --git a/src/test/java/com/sk89q/worldguard/TestPlayer.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/TestPlayer.java similarity index 96% rename from src/test/java/com/sk89q/worldguard/TestPlayer.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/TestPlayer.java index 21ac0f6a..ff7d406e 100644 --- a/src/test/java/com/sk89q/worldguard/TestPlayer.java +++ b/worldguard-legacy/src/test/java/com/sk89q/worldguard/TestPlayer.java @@ -1,87 +1,87 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard; - -import com.sk89q.worldedit.Vector; - -import java.util.HashSet; -import java.util.Set; -import java.util.UUID; - -@org.junit.Ignore -public class TestPlayer extends LocalPlayer { - - private final UUID uuid = UUID.randomUUID(); - private final String name; - private final Set groups = new HashSet(); - - public TestPlayer(String name) { - this.name = name; - } - - public void addGroup(String group) { - groups.add(group.toLowerCase()); - } - - @Override - public String getName() { - return name; - } - - @Override - public UUID getUniqueId() { - return uuid; - } - - @Override - public boolean hasGroup(String group) { - return groups.contains(group.toLowerCase()); - } - - @Override - public Vector getPosition() { - return new Vector(0, 0, 0); - } - - @Override - public void kick(String msg) { - System.out.println("TestPlayer{" + this.name + "} kicked!"); - } - - @Override - public void ban(String msg) { - System.out.println("TestPlayer{" + this.name + "} banned!"); - } - - @Override - public void printRaw(String msg) { - System.out.println("-> TestPlayer{" + this.name + "}: " + msg); - } - - @Override - public String[] getGroups() { - return groups.toArray(new String[groups.size()]); - } - - @Override - public boolean hasPermission(String perm) { - return true; - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard; + +import com.sk89q.worldedit.Vector; + +import java.util.HashSet; +import java.util.Set; +import java.util.UUID; + +@org.junit.Ignore +public class TestPlayer extends LocalPlayer { + + private final UUID uuid = UUID.randomUUID(); + private final String name; + private final Set groups = new HashSet(); + + public TestPlayer(String name) { + this.name = name; + } + + public void addGroup(String group) { + groups.add(group.toLowerCase()); + } + + @Override + public String getName() { + return name; + } + + @Override + public UUID getUniqueId() { + return uuid; + } + + @Override + public boolean hasGroup(String group) { + return groups.contains(group.toLowerCase()); + } + + @Override + public Vector getPosition() { + return new Vector(0, 0, 0); + } + + @Override + public void kick(String msg) { + System.out.println("TestPlayer{" + this.name + "} kicked!"); + } + + @Override + public void ban(String msg) { + System.out.println("TestPlayer{" + this.name + "} banned!"); + } + + @Override + public void printRaw(String msg) { + System.out.println("-> TestPlayer{" + this.name + "}: " + msg); + } + + @Override + public String[] getGroups() { + return groups.toArray(new String[groups.size()]); + } + + @Override + public boolean hasPermission(String perm) { + return true; + } +} diff --git a/src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java similarity index 97% rename from src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java index 43c144a6..0bd313a6 100644 --- a/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java +++ b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/ApplicableRegionSetTest.java @@ -1,641 +1,641 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.flags.StringFlag; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.util.command.CommandFilter; -import org.junit.Test; - -import java.util.HashSet; -import java.util.Set; - -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.*; - -public class ApplicableRegionSetTest { - - @Test - public void testWildernessBuild() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer player = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); - } - - @Test - public void testWildernessBuildWithGlobalRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer player = mock.createPlayer(); - - ProtectedRegion global = mock.global(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); - } - - @Test - public void testWildernessBuildWithRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ProtectedRegion region = mock.add(0); - region.getMembers().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertThat(set.testState(member, DefaultFlag.BUILD), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.BUILD), is(false)); - } - - @Test - public void testWildernessFlags() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer player = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - - assertThat(set.testState(player, DefaultFlag.MOB_DAMAGE), is(true)); - assertThat(set.testState(player, DefaultFlag.ENTRY), is(true)); - assertThat(set.testState(player, DefaultFlag.EXIT), is(true)); - assertThat(set.testState(player, DefaultFlag.LEAF_DECAY), is(true)); - assertThat(set.testState(player, DefaultFlag.RECEIVE_CHAT), is(true)); - assertThat(set.testState(player, DefaultFlag.SEND_CHAT), is(true)); - assertThat(set.testState(player, DefaultFlag.INVINCIBILITY), is(false)); - - assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); - } - - @Test - public void testWildernessFlagsWithGlobalRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer player = mock.createPlayer(); - - ProtectedRegion global = mock.global(); - - ApplicableRegionSet set = mock.getApplicableSet(); - - assertThat(set.testState(player, DefaultFlag.MOB_DAMAGE), is(true)); - assertThat(set.testState(player, DefaultFlag.ENTRY), is(true)); - assertThat(set.testState(player, DefaultFlag.EXIT), is(true)); - assertThat(set.testState(player, DefaultFlag.LEAF_DECAY), is(true)); - assertThat(set.testState(player, DefaultFlag.RECEIVE_CHAT), is(true)); - assertThat(set.testState(player, DefaultFlag.SEND_CHAT), is(true)); - assertThat(set.testState(player, DefaultFlag.INVINCIBILITY), is(false)); - - assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); - } - - @Test - public void testFlagsWithRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ProtectedRegion region = mock.add(0); - region.getMembers().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - - assertThat(set.testState(member, DefaultFlag.MOB_DAMAGE), is(true)); - assertThat(set.testState(member, DefaultFlag.ENTRY), is(true)); - assertThat(set.testState(member, DefaultFlag.EXIT), is(true)); - assertThat(set.testState(member, DefaultFlag.LEAF_DECAY), is(true)); - assertThat(set.testState(member, DefaultFlag.RECEIVE_CHAT), is(true)); - assertThat(set.testState(member, DefaultFlag.SEND_CHAT), is(true)); - assertThat(set.testState(member, DefaultFlag.INVINCIBILITY), is(false)); - - assertThat(set.testState(member, DefaultFlag.BUILD), is(true)); - - assertThat(set.testState(nonMember, DefaultFlag.MOB_DAMAGE), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.ENTRY), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.EXIT), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.LEAF_DECAY), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.RECEIVE_CHAT), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.SEND_CHAT), is(true)); - assertThat(set.testState(nonMember, DefaultFlag.INVINCIBILITY), is(false)); - - assertThat(set.testState(nonMember, DefaultFlag.BUILD), is(false)); - } - - @Test - public void testStateFlagPriorityFallThrough() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - StateFlag state1 = new StateFlag(null, false); - StateFlag state2 = new StateFlag(null, false); - StateFlag state3 = new StateFlag(null, false); - - region = mock.add(0); - region.setFlag(state1, StateFlag.State.ALLOW); - region.setFlag(state2, StateFlag.State.DENY); - - region = mock.add(1); - region.setFlag(state1, StateFlag.State.DENY); - region.setFlag(state3, StateFlag.State.ALLOW); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.allows(state1)); - assertFalse(set.allows(state2)); - assertTrue(set.allows(state3)); - } - - @Test - public void testNonStateFlagPriorityFallThrough() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - StringFlag string1 = new StringFlag(null); - StringFlag string2 = new StringFlag(null); - StringFlag string3 = new StringFlag(null); - StringFlag string4 = new StringFlag(null); - - region = mock.add(0); - region.setFlag(string1, "Beans"); - region.setFlag(string2, "Apples"); - - region = mock.add(1); - region.setFlag(string1, "Cats"); - region.setFlag(string3, "Bananas"); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertEquals(set.getFlag(string1), "Cats"); - assertEquals(set.getFlag(string2), "Apples"); - assertEquals(set.getFlag(string3), "Bananas"); - assertEquals(set.getFlag(string4), null); - } - - @Test - public void testStateFlagMultiplePriorityFallThrough() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - StringFlag string1 = new StringFlag(null); - StringFlag string2 = new StringFlag(null); - StringFlag string3 = new StringFlag(null); - StringFlag string4 = new StringFlag(null); - - region = mock.add(0); - region.setFlag(string1, "Beans"); - region.setFlag(string2, "Apples"); - region.setFlag(string3, "Dogs"); - - region = mock.add(1); - region.setFlag(string1, "Cats"); - region.setFlag(string3, "Bananas"); - - region = mock.add(10); - region.setFlag(string3, "Strings"); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertEquals(set.getFlag(string1), "Cats"); - assertEquals(set.getFlag(string2), "Apples"); - assertEquals(set.getFlag(string3), "Strings"); - assertEquals(set.getFlag(string4), null); - } - - @Test - public void testStateGlobalDefault() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - StateFlag state1 = new StateFlag(null, false); - StateFlag state2 = new StateFlag(null, false); - StateFlag state3 = new StateFlag(null, false); - StateFlag state4 = new StateFlag(null, true); - StateFlag state5 = new StateFlag(null, true); - StateFlag state6 = new StateFlag(null, true); - - region = mock.global(); - region.setFlag(state1, StateFlag.State.ALLOW); - region.setFlag(state2, StateFlag.State.DENY); - region.setFlag(state4, StateFlag.State.ALLOW); - region.setFlag(state5, StateFlag.State.DENY); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.allows(state1)); - assertFalse(set.allows(state2)); - assertFalse(set.allows(state3)); - assertTrue(set.allows(state4)); - assertFalse(set.allows(state5)); - assertTrue(set.allows(state6)); - } - - @Test - public void testStateGlobalWithRegionsDefault() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - StateFlag state1 = new StateFlag(null, false); - StateFlag state2 = new StateFlag(null, false); - StateFlag state3 = new StateFlag(null, false); - StateFlag state4 = new StateFlag(null, true); - StateFlag state5 = new StateFlag(null, true); - StateFlag state6 = new StateFlag(null, true); - - region = mock.global(); - region.setFlag(state1, StateFlag.State.ALLOW); - region.setFlag(state2, StateFlag.State.DENY); - region.setFlag(state4, StateFlag.State.ALLOW); - region.setFlag(state5, StateFlag.State.DENY); - - region = mock.add(0); - region.setFlag(state1, StateFlag.State.DENY); - region.setFlag(state2, StateFlag.State.DENY); - region.setFlag(state4, StateFlag.State.DENY); - region.setFlag(state5, StateFlag.State.DENY); - - region = mock.add(1); - region.setFlag(state5, StateFlag.State.ALLOW); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.allows(state1)); - assertFalse(set.allows(state2)); - assertFalse(set.allows(state3)); - assertFalse(set.allows(state4)); - assertTrue(set.allows(state5)); - assertTrue(set.allows(state6)); - } - - @Test - public void testBuildAccess() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testBuildRegionPriorities() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer upperMember = mock.createPlayer(); - LocalPlayer lowerMember = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(lowerMember); - - region = mock.add(1); - region.getOwners().addPlayer(upperMember); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(upperMember)); - assertFalse(set.canBuild(lowerMember)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testBuildDenyFlag() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testBuildAllowFlag() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertTrue(set.canBuild(nonMember)); - } - - @Test - public void testHigherPriorityOverrideBuildDenyFlag() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - region = mock.add(1); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertTrue(set.canBuild(nonMember)); - } - - @Test - public void testHigherPriorityUnsetBuildDenyFlag() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - region = mock.add(1); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testPriorityDisjointBuildDenyFlagAndMembership() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - region = mock.add(1); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testPriorityDisjointBuildDenyFlagAndRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - region = mock.add(1); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testPriorityDisjointMembershipAndBuildDenyFlag() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.add(0); - region.getOwners().addPlayer(member); - - region = mock.add(1); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testNoGlobalRegionDefaultBuild() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertTrue(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionDefaultBuild() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - @SuppressWarnings("unused") - ProtectedRegion region = mock.global(); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertTrue(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionBuildFlagAllow() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertTrue(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionBuildFlagDeny() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionBuildFlagAllowWithRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); - - region = mock.add(0); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionBuildFlagDenyWithRegion() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - - region = mock.add(0); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionHavingOwnershipBuildFlagUnset() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionHavingOwnershipBuildFlagAllow() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertTrue(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionHavingOwnershipBuildFlagDeny() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer member = mock.createPlayer(); - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); - region.getOwners().addPlayer(member); - - ApplicableRegionSet set = mock.getApplicableSet(); - assertFalse(set.canBuild(member)); - assertFalse(set.canBuild(nonMember)); - } - - @Test - public void testGlobalRegionCommandBlacklistWithRegionWhitelist() { - MockApplicableRegionSet mock = new MockApplicableRegionSet(); - ProtectedRegion region; - - LocalPlayer nonMember = mock.createPlayer(); - - region = mock.global(); - Set blocked = new HashSet(); - blocked.add("/deny"); - blocked.add("/strange"); - region.setFlag(DefaultFlag.BLOCKED_CMDS, blocked); - - region = mock.add(0); - Set allowed = new HashSet(); - allowed.add("/permit"); - allowed.add("/strange"); - region.setFlag(DefaultFlag.ALLOWED_CMDS, allowed); - - ApplicableRegionSet set; - CommandFilter test; - - set = mock.getApplicableSet(); - test = new CommandFilter( - set.getFlag(DefaultFlag.ALLOWED_CMDS, nonMember), - set.getFlag(DefaultFlag.BLOCKED_CMDS, nonMember)); - assertThat(test.apply("/permit"), is(true)); - assertThat(test.apply("/strange"), is(true)); - assertThat(test.apply("/other"), is(false)); - assertThat(test.apply("/deny"), is(false)); - - set = mock.getApplicableSetInWilderness(); - test = new CommandFilter( - set.getFlag(DefaultFlag.ALLOWED_CMDS, nonMember), - set.getFlag(DefaultFlag.BLOCKED_CMDS, nonMember)); - assertThat(test.apply("/permit"), is(true)); - assertThat(test.apply("/strange"), is(false)); - assertThat(test.apply("/other"), is(true)); - assertThat(test.apply("/deny"), is(false)); - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.protection.flags.DefaultFlag; +import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.flags.StringFlag; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.sk89q.worldguard.util.command.CommandFilter; +import org.junit.Test; + +import java.util.HashSet; +import java.util.Set; + +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.*; + +public class ApplicableRegionSetTest { + + @Test + public void testWildernessBuild() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer player = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); + } + + @Test + public void testWildernessBuildWithGlobalRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer player = mock.createPlayer(); + + ProtectedRegion global = mock.global(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); + } + + @Test + public void testWildernessBuildWithRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ProtectedRegion region = mock.add(0); + region.getMembers().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertThat(set.testState(member, DefaultFlag.BUILD), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.BUILD), is(false)); + } + + @Test + public void testWildernessFlags() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer player = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + + assertThat(set.testState(player, DefaultFlag.MOB_DAMAGE), is(true)); + assertThat(set.testState(player, DefaultFlag.ENTRY), is(true)); + assertThat(set.testState(player, DefaultFlag.EXIT), is(true)); + assertThat(set.testState(player, DefaultFlag.LEAF_DECAY), is(true)); + assertThat(set.testState(player, DefaultFlag.RECEIVE_CHAT), is(true)); + assertThat(set.testState(player, DefaultFlag.SEND_CHAT), is(true)); + assertThat(set.testState(player, DefaultFlag.INVINCIBILITY), is(false)); + + assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); + } + + @Test + public void testWildernessFlagsWithGlobalRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer player = mock.createPlayer(); + + ProtectedRegion global = mock.global(); + + ApplicableRegionSet set = mock.getApplicableSet(); + + assertThat(set.testState(player, DefaultFlag.MOB_DAMAGE), is(true)); + assertThat(set.testState(player, DefaultFlag.ENTRY), is(true)); + assertThat(set.testState(player, DefaultFlag.EXIT), is(true)); + assertThat(set.testState(player, DefaultFlag.LEAF_DECAY), is(true)); + assertThat(set.testState(player, DefaultFlag.RECEIVE_CHAT), is(true)); + assertThat(set.testState(player, DefaultFlag.SEND_CHAT), is(true)); + assertThat(set.testState(player, DefaultFlag.INVINCIBILITY), is(false)); + + assertThat(set.testState(player, DefaultFlag.BUILD), is(true)); + } + + @Test + public void testFlagsWithRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ProtectedRegion region = mock.add(0); + region.getMembers().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + + assertThat(set.testState(member, DefaultFlag.MOB_DAMAGE), is(true)); + assertThat(set.testState(member, DefaultFlag.ENTRY), is(true)); + assertThat(set.testState(member, DefaultFlag.EXIT), is(true)); + assertThat(set.testState(member, DefaultFlag.LEAF_DECAY), is(true)); + assertThat(set.testState(member, DefaultFlag.RECEIVE_CHAT), is(true)); + assertThat(set.testState(member, DefaultFlag.SEND_CHAT), is(true)); + assertThat(set.testState(member, DefaultFlag.INVINCIBILITY), is(false)); + + assertThat(set.testState(member, DefaultFlag.BUILD), is(true)); + + assertThat(set.testState(nonMember, DefaultFlag.MOB_DAMAGE), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.ENTRY), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.EXIT), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.LEAF_DECAY), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.RECEIVE_CHAT), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.SEND_CHAT), is(true)); + assertThat(set.testState(nonMember, DefaultFlag.INVINCIBILITY), is(false)); + + assertThat(set.testState(nonMember, DefaultFlag.BUILD), is(false)); + } + + @Test + public void testStateFlagPriorityFallThrough() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); + + region = mock.add(0); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); + + region = mock.add(1); + region.setFlag(state1, StateFlag.State.DENY); + region.setFlag(state3, StateFlag.State.ALLOW); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.allows(state1)); + assertFalse(set.allows(state2)); + assertTrue(set.allows(state3)); + } + + @Test + public void testNonStateFlagPriorityFallThrough() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + StringFlag string1 = new StringFlag(null); + StringFlag string2 = new StringFlag(null); + StringFlag string3 = new StringFlag(null); + StringFlag string4 = new StringFlag(null); + + region = mock.add(0); + region.setFlag(string1, "Beans"); + region.setFlag(string2, "Apples"); + + region = mock.add(1); + region.setFlag(string1, "Cats"); + region.setFlag(string3, "Bananas"); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertEquals(set.getFlag(string1), "Cats"); + assertEquals(set.getFlag(string2), "Apples"); + assertEquals(set.getFlag(string3), "Bananas"); + assertEquals(set.getFlag(string4), null); + } + + @Test + public void testStateFlagMultiplePriorityFallThrough() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + StringFlag string1 = new StringFlag(null); + StringFlag string2 = new StringFlag(null); + StringFlag string3 = new StringFlag(null); + StringFlag string4 = new StringFlag(null); + + region = mock.add(0); + region.setFlag(string1, "Beans"); + region.setFlag(string2, "Apples"); + region.setFlag(string3, "Dogs"); + + region = mock.add(1); + region.setFlag(string1, "Cats"); + region.setFlag(string3, "Bananas"); + + region = mock.add(10); + region.setFlag(string3, "Strings"); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertEquals(set.getFlag(string1), "Cats"); + assertEquals(set.getFlag(string2), "Apples"); + assertEquals(set.getFlag(string3), "Strings"); + assertEquals(set.getFlag(string4), null); + } + + @Test + public void testStateGlobalDefault() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); + StateFlag state4 = new StateFlag(null, true); + StateFlag state5 = new StateFlag(null, true); + StateFlag state6 = new StateFlag(null, true); + + region = mock.global(); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.ALLOW); + region.setFlag(state5, StateFlag.State.DENY); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.allows(state1)); + assertFalse(set.allows(state2)); + assertFalse(set.allows(state3)); + assertTrue(set.allows(state4)); + assertFalse(set.allows(state5)); + assertTrue(set.allows(state6)); + } + + @Test + public void testStateGlobalWithRegionsDefault() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + StateFlag state1 = new StateFlag(null, false); + StateFlag state2 = new StateFlag(null, false); + StateFlag state3 = new StateFlag(null, false); + StateFlag state4 = new StateFlag(null, true); + StateFlag state5 = new StateFlag(null, true); + StateFlag state6 = new StateFlag(null, true); + + region = mock.global(); + region.setFlag(state1, StateFlag.State.ALLOW); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.ALLOW); + region.setFlag(state5, StateFlag.State.DENY); + + region = mock.add(0); + region.setFlag(state1, StateFlag.State.DENY); + region.setFlag(state2, StateFlag.State.DENY); + region.setFlag(state4, StateFlag.State.DENY); + region.setFlag(state5, StateFlag.State.DENY); + + region = mock.add(1); + region.setFlag(state5, StateFlag.State.ALLOW); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.allows(state1)); + assertFalse(set.allows(state2)); + assertFalse(set.allows(state3)); + assertFalse(set.allows(state4)); + assertTrue(set.allows(state5)); + assertTrue(set.allows(state6)); + } + + @Test + public void testBuildAccess() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testBuildRegionPriorities() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer upperMember = mock.createPlayer(); + LocalPlayer lowerMember = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(lowerMember); + + region = mock.add(1); + region.getOwners().addPlayer(upperMember); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(upperMember)); + assertFalse(set.canBuild(lowerMember)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testBuildDenyFlag() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testBuildAllowFlag() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertTrue(set.canBuild(nonMember)); + } + + @Test + public void testHigherPriorityOverrideBuildDenyFlag() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + region = mock.add(1); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertTrue(set.canBuild(nonMember)); + } + + @Test + public void testHigherPriorityUnsetBuildDenyFlag() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + region = mock.add(1); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testPriorityDisjointBuildDenyFlagAndMembership() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + region = mock.add(1); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testPriorityDisjointBuildDenyFlagAndRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + region = mock.add(1); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testPriorityDisjointMembershipAndBuildDenyFlag() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.add(0); + region.getOwners().addPlayer(member); + + region = mock.add(1); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testNoGlobalRegionDefaultBuild() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertTrue(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionDefaultBuild() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + @SuppressWarnings("unused") + ProtectedRegion region = mock.global(); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertTrue(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionBuildFlagAllow() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertTrue(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionBuildFlagDeny() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionBuildFlagAllowWithRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); + + region = mock.add(0); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionBuildFlagDenyWithRegion() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + + region = mock.add(0); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionHavingOwnershipBuildFlagUnset() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionHavingOwnershipBuildFlagAllow() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.ALLOW); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertTrue(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionHavingOwnershipBuildFlagDeny() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer member = mock.createPlayer(); + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + region.setFlag(DefaultFlag.BUILD, StateFlag.State.DENY); + region.getOwners().addPlayer(member); + + ApplicableRegionSet set = mock.getApplicableSet(); + assertFalse(set.canBuild(member)); + assertFalse(set.canBuild(nonMember)); + } + + @Test + public void testGlobalRegionCommandBlacklistWithRegionWhitelist() { + MockApplicableRegionSet mock = new MockApplicableRegionSet(); + ProtectedRegion region; + + LocalPlayer nonMember = mock.createPlayer(); + + region = mock.global(); + Set blocked = new HashSet(); + blocked.add("/deny"); + blocked.add("/strange"); + region.setFlag(DefaultFlag.BLOCKED_CMDS, blocked); + + region = mock.add(0); + Set allowed = new HashSet(); + allowed.add("/permit"); + allowed.add("/strange"); + region.setFlag(DefaultFlag.ALLOWED_CMDS, allowed); + + ApplicableRegionSet set; + CommandFilter test; + + set = mock.getApplicableSet(); + test = new CommandFilter( + set.getFlag(DefaultFlag.ALLOWED_CMDS, nonMember), + set.getFlag(DefaultFlag.BLOCKED_CMDS, nonMember)); + assertThat(test.apply("/permit"), is(true)); + assertThat(test.apply("/strange"), is(true)); + assertThat(test.apply("/other"), is(false)); + assertThat(test.apply("/deny"), is(false)); + + set = mock.getApplicableSetInWilderness(); + test = new CommandFilter( + set.getFlag(DefaultFlag.ALLOWED_CMDS, nonMember), + set.getFlag(DefaultFlag.BLOCKED_CMDS, nonMember)); + assertThat(test.apply("/permit"), is(true)); + assertThat(test.apply("/strange"), is(false)); + assertThat(test.apply("/other"), is(true)); + assertThat(test.apply("/deny"), is(false)); + } + +} diff --git a/src/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/FlagValueCalculatorTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/HashMapIndexPriorityTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexPriorityTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/HashMapIndexPriorityTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexPriorityTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/HashMapIndexRegionOverlapTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexRegionOverlapTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/HashMapIndexRegionOverlapTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexRegionOverlapTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/HashMapIndexTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/HashMapIndexTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/HashMapIndexTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java similarity index 97% rename from src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java index b0400f60..e9ad3b70 100644 --- a/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java +++ b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/MockApplicableRegionSet.java @@ -1,99 +1,99 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldguard.LocalPlayer; -import com.sk89q.worldguard.TestPlayer; -import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; -import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import com.sk89q.worldguard.protection.util.NormativeOrders; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -public class MockApplicableRegionSet { - - private List regions = new ArrayList(); - private ProtectedRegion global; - private int id = 0; - private int playerIndex = 0; - - public void add(ProtectedRegion region) { - regions.add(region); - } - - public LocalPlayer createPlayer() { - playerIndex++; - LocalPlayer player = new TestPlayer("#PLAYER_" + playerIndex); - return player; - } - - public ProtectedRegion global() { - global = new GlobalProtectedRegion("__global__"); - return global; - } - - public ProtectedRegion createOutside(int priority) { - ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), - new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); - region.setPriority(priority); - return region; - } - - public ProtectedRegion add(int priority) { - ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), - new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); - region.setPriority(priority); - add(region); - return region; - } - - public ProtectedRegion add(int priority, ProtectedRegion parent) - throws ProtectedRegion.CircularInheritanceException { - ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), - new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); - region.setPriority(priority); - region.setParent(parent); - add(region); - return region; - } - - public ApplicableRegionSet getApplicableSetInWilderness() { - return new RegionResultSet(Collections.emptyList(), global); - } - - public ApplicableRegionSet getApplicableSet() { - return new RegionResultSet(regions, global); - } - - public FlagValueCalculator getFlagCalculator() { - NormativeOrders.sort(regions); - return new FlagValueCalculator(regions, global); - } - - private String getNextId() { - id++; - return "REGION_" + id; - } - -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.TestPlayer; +import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; +import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import com.sk89q.worldguard.protection.util.NormativeOrders; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +public class MockApplicableRegionSet { + + private List regions = new ArrayList(); + private ProtectedRegion global; + private int id = 0; + private int playerIndex = 0; + + public void add(ProtectedRegion region) { + regions.add(region); + } + + public LocalPlayer createPlayer() { + playerIndex++; + LocalPlayer player = new TestPlayer("#PLAYER_" + playerIndex); + return player; + } + + public ProtectedRegion global() { + global = new GlobalProtectedRegion("__global__"); + return global; + } + + public ProtectedRegion createOutside(int priority) { + ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), + new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); + region.setPriority(priority); + return region; + } + + public ProtectedRegion add(int priority) { + ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), + new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); + region.setPriority(priority); + add(region); + return region; + } + + public ProtectedRegion add(int priority, ProtectedRegion parent) + throws ProtectedRegion.CircularInheritanceException { + ProtectedRegion region = new ProtectedCuboidRegion(getNextId(), + new BlockVector(0, 0, 0), new BlockVector(1, 1, 1)); + region.setPriority(priority); + region.setParent(parent); + add(region); + return region; + } + + public ApplicableRegionSet getApplicableSetInWilderness() { + return new RegionResultSet(Collections.emptyList(), global); + } + + public ApplicableRegionSet getApplicableSet() { + return new RegionResultSet(regions, global); + } + + public FlagValueCalculator getFlagCalculator() { + NormativeOrders.sort(regions); + return new FlagValueCalculator(regions, global); + } + + private String getNextId() { + id++; + return "REGION_" + id; + } + +} diff --git a/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeIndexTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeIndexTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/PriorityRTreeIndexTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeIndexTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionEntryExitTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionEntryExitTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionEntryExitTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionEntryExitTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionOverlapTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionOverlapTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionOverlapTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionOverlapTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionPriorityTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionPriorityTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionPriorityTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/PriorityRTreeRegionPriorityTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionEntryExitTest.java diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java similarity index 97% rename from src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java index 362e4fe7..513434f7 100644 --- a/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java +++ b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionOverlapTest.java @@ -1,181 +1,181 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.HashSet; - -import org.junit.Before; -import org.junit.Test; - -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.BlockVector2D; -import com.sk89q.worldedit.Vector; -import com.sk89q.worldguard.TestPlayer; -import com.sk89q.worldguard.domains.DefaultDomain; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.managers.RegionManager; -import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; -import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; -import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; - -public abstract class RegionOverlapTest { - static String COURTYARD_ID = "courtyard"; - static String FOUNTAIN_ID = "fountain"; - static String NO_FIRE_ID = "nofire"; - static String MEMBER_GROUP = "member"; - static String COURTYARD_GROUP = "courtyard"; - - Vector inFountain = new Vector(2, 2, 2); - Vector inCourtyard = new Vector(7, 7, 7); - Vector outside = new Vector(15, 15, 15); - Vector inNoFire = new Vector(150, 150, 150); - RegionManager manager; - ProtectedRegion globalRegion; - ProtectedRegion courtyard; - ProtectedRegion fountain; - TestPlayer player1; - TestPlayer player2; - - protected abstract RegionManager createRegionManager() throws Exception; - - @Before - public void setUp() throws Exception { - setUpGlobalRegion(); - - manager = createRegionManager(); - - setUpPlayers(); - setUpCourtyardRegion(); - setUpFountainRegion(); - setUpNoFireRegion(); - } - - void setUpPlayers() { - player1 = new TestPlayer("tetsu"); - player1.addGroup(MEMBER_GROUP); - player1.addGroup(COURTYARD_GROUP); - - player2 = new TestPlayer("alex"); - player2.addGroup(MEMBER_GROUP); - } - - void setUpGlobalRegion() { - globalRegion = new GlobalProtectedRegion("__global__"); - } - - void setUpCourtyardRegion() { - DefaultDomain domain = new DefaultDomain(); - domain.addGroup(COURTYARD_GROUP); - - ArrayList points = new ArrayList(); - points.add(new BlockVector2D(0, 0)); - points.add(new BlockVector2D(10, 0)); - points.add(new BlockVector2D(10, 10)); - points.add(new BlockVector2D(0, 10)); - - //ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID, new BlockVector(0, 0, 0), new BlockVector(10, 10, 10)); - ProtectedRegion region = new ProtectedPolygonalRegion(COURTYARD_ID, points, 0, 10); - - region.setOwners(domain); - manager.addRegion(region); - - courtyard = region; - } - - void setUpFountainRegion() throws Exception { - DefaultDomain domain = new DefaultDomain(); - domain.addGroup(MEMBER_GROUP); - - ProtectedRegion region = new ProtectedCuboidRegion(FOUNTAIN_ID, - new BlockVector(0, 0, 0), new BlockVector(5, 5, 5)); - region.setMembers(domain); - manager.addRegion(region); - - fountain = region; - fountain.setParent(courtyard); - fountain.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); - } - - void setUpNoFireRegion() throws Exception { - ProtectedRegion region = new ProtectedCuboidRegion(NO_FIRE_ID, - new BlockVector(100, 100, 100), new BlockVector(200, 200, 200)); - manager.addRegion(region); - region.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); - } - - @Test - public void testNonBuildFlag() { - ApplicableRegionSet appl; - - // Outside - appl = manager.getApplicableRegions(outside); - assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); - // Inside courtyard - appl = manager.getApplicableRegions(inCourtyard); - assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); - // Inside fountain - appl = manager.getApplicableRegions(inFountain); - assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); - - // Inside no fire zone - appl = manager.getApplicableRegions(inNoFire); - assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); - } - - @Test - public void testPlayer1BuildAccess() { - ApplicableRegionSet appl; - - // Outside - appl = manager.getApplicableRegions(outside); - assertTrue(appl.canBuild(player1)); - // Inside courtyard - appl = manager.getApplicableRegions(inCourtyard); - assertTrue(appl.canBuild(player1)); - // Inside fountain - appl = manager.getApplicableRegions(inFountain); - assertTrue(appl.canBuild(player1)); - } - - @Test - public void testPlayer2BuildAccess() { - ApplicableRegionSet appl; - - HashSet test = new HashSet(); - test.add(courtyard); - test.add(fountain); - - // Outside - appl = manager.getApplicableRegions(outside); - assertTrue(appl.canBuild(player2)); - // Inside courtyard - appl = manager.getApplicableRegions(inCourtyard); - assertFalse(appl.canBuild(player2)); - // Inside fountain - appl = manager.getApplicableRegions(inFountain); - assertTrue(appl.canBuild(player2)); - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.HashSet; + +import org.junit.Before; +import org.junit.Test; + +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.BlockVector2D; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldguard.TestPlayer; +import com.sk89q.worldguard.domains.DefaultDomain; +import com.sk89q.worldguard.protection.flags.DefaultFlag; +import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.managers.RegionManager; +import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; +import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; +import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; + +public abstract class RegionOverlapTest { + static String COURTYARD_ID = "courtyard"; + static String FOUNTAIN_ID = "fountain"; + static String NO_FIRE_ID = "nofire"; + static String MEMBER_GROUP = "member"; + static String COURTYARD_GROUP = "courtyard"; + + Vector inFountain = new Vector(2, 2, 2); + Vector inCourtyard = new Vector(7, 7, 7); + Vector outside = new Vector(15, 15, 15); + Vector inNoFire = new Vector(150, 150, 150); + RegionManager manager; + ProtectedRegion globalRegion; + ProtectedRegion courtyard; + ProtectedRegion fountain; + TestPlayer player1; + TestPlayer player2; + + protected abstract RegionManager createRegionManager() throws Exception; + + @Before + public void setUp() throws Exception { + setUpGlobalRegion(); + + manager = createRegionManager(); + + setUpPlayers(); + setUpCourtyardRegion(); + setUpFountainRegion(); + setUpNoFireRegion(); + } + + void setUpPlayers() { + player1 = new TestPlayer("tetsu"); + player1.addGroup(MEMBER_GROUP); + player1.addGroup(COURTYARD_GROUP); + + player2 = new TestPlayer("alex"); + player2.addGroup(MEMBER_GROUP); + } + + void setUpGlobalRegion() { + globalRegion = new GlobalProtectedRegion("__global__"); + } + + void setUpCourtyardRegion() { + DefaultDomain domain = new DefaultDomain(); + domain.addGroup(COURTYARD_GROUP); + + ArrayList points = new ArrayList(); + points.add(new BlockVector2D(0, 0)); + points.add(new BlockVector2D(10, 0)); + points.add(new BlockVector2D(10, 10)); + points.add(new BlockVector2D(0, 10)); + + //ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID, new BlockVector(0, 0, 0), new BlockVector(10, 10, 10)); + ProtectedRegion region = new ProtectedPolygonalRegion(COURTYARD_ID, points, 0, 10); + + region.setOwners(domain); + manager.addRegion(region); + + courtyard = region; + } + + void setUpFountainRegion() throws Exception { + DefaultDomain domain = new DefaultDomain(); + domain.addGroup(MEMBER_GROUP); + + ProtectedRegion region = new ProtectedCuboidRegion(FOUNTAIN_ID, + new BlockVector(0, 0, 0), new BlockVector(5, 5, 5)); + region.setMembers(domain); + manager.addRegion(region); + + fountain = region; + fountain.setParent(courtyard); + fountain.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); + } + + void setUpNoFireRegion() throws Exception { + ProtectedRegion region = new ProtectedCuboidRegion(NO_FIRE_ID, + new BlockVector(100, 100, 100), new BlockVector(200, 200, 200)); + manager.addRegion(region); + region.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); + } + + @Test + public void testNonBuildFlag() { + ApplicableRegionSet appl; + + // Outside + appl = manager.getApplicableRegions(outside); + assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); + // Inside courtyard + appl = manager.getApplicableRegions(inCourtyard); + assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); + // Inside fountain + appl = manager.getApplicableRegions(inFountain); + assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); + + // Inside no fire zone + appl = manager.getApplicableRegions(inNoFire); + assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); + } + + @Test + public void testPlayer1BuildAccess() { + ApplicableRegionSet appl; + + // Outside + appl = manager.getApplicableRegions(outside); + assertTrue(appl.canBuild(player1)); + // Inside courtyard + appl = manager.getApplicableRegions(inCourtyard); + assertTrue(appl.canBuild(player1)); + // Inside fountain + appl = manager.getApplicableRegions(inFountain); + assertTrue(appl.canBuild(player1)); + } + + @Test + public void testPlayer2BuildAccess() { + ApplicableRegionSet appl; + + HashSet test = new HashSet(); + test.add(courtyard); + test.add(fountain); + + // Outside + appl = manager.getApplicableRegions(outside); + assertTrue(appl.canBuild(player2)); + // Inside courtyard + appl = manager.getApplicableRegions(inCourtyard); + assertFalse(appl.canBuild(player2)); + // Inside fountain + appl = manager.getApplicableRegions(inFountain); + assertTrue(appl.canBuild(player2)); + } +} diff --git a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java similarity index 97% rename from src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java index e7a90b94..5539d758 100644 --- a/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java +++ b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/RegionPriorityTest.java @@ -1,160 +1,160 @@ -/* - * WorldGuard, a suite of tools for Minecraft - * Copyright (C) sk89q - * Copyright (C) WorldGuard team and contributors - * - * This program is free software: you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as published by the - * Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - * for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.sk89q.worldguard.protection; - -import com.sk89q.worldedit.BlockVector; -import com.sk89q.worldedit.BlockVector2D; -import com.sk89q.worldedit.Vector; -import com.sk89q.worldguard.TestPlayer; -import com.sk89q.worldguard.domains.DefaultDomain; -import com.sk89q.worldguard.protection.flags.DefaultFlag; -import com.sk89q.worldguard.protection.flags.StateFlag; -import com.sk89q.worldguard.protection.managers.RegionManager; -import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; -import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; -import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; -import com.sk89q.worldguard.protection.regions.ProtectedRegion; -import org.junit.Before; -import org.junit.Test; - -import java.util.ArrayList; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -public abstract class RegionPriorityTest { - static String COURTYARD_ID = "courtyard"; - static String FOUNTAIN_ID = "fountain"; - static String NO_FIRE_ID = "nofire"; - static String MEMBER_GROUP = "member"; - static String COURTYARD_GROUP = "courtyard"; - - Vector inFountain = new Vector(2, 2, 2); - Vector inCourtyard = new Vector(7, 7, 7); - Vector outside = new Vector(15, 15, 15); - RegionManager manager; - ProtectedRegion globalRegion; - ProtectedRegion courtyard; - ProtectedRegion fountain; - TestPlayer player1; - TestPlayer player2; - - protected abstract RegionManager createRegionManager() throws Exception; - - @Before - public void setUp() throws Exception { - setUpGlobalRegion(); - - manager = createRegionManager(); - - setUpPlayers(); - setUpCourtyardRegion(); - setUpFountainRegion(); - } - - void setUpPlayers() { - player1 = new TestPlayer("tetsu"); - player1.addGroup(MEMBER_GROUP); - player1.addGroup(COURTYARD_GROUP); - - player2 = new TestPlayer("alex"); - player2.addGroup(MEMBER_GROUP); - } - - void setUpGlobalRegion() { - globalRegion = new GlobalProtectedRegion("__global__"); - } - - void setUpCourtyardRegion() { - DefaultDomain domain = new DefaultDomain(); - domain.addGroup(COURTYARD_GROUP); - - ArrayList points = new ArrayList(); - points.add(new BlockVector2D(0, 0)); - points.add(new BlockVector2D(10, 0)); - points.add(new BlockVector2D(10, 10)); - points.add(new BlockVector2D(0, 10)); - - //ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID, new BlockVector(0, 0, 0), new BlockVector(10, 10, 10)); - ProtectedRegion region = new ProtectedPolygonalRegion(COURTYARD_ID, points, 0, 10); - - region.setOwners(domain); - manager.addRegion(region); - - courtyard = region; - courtyard.setFlag(DefaultFlag.MOB_SPAWNING, StateFlag.State.DENY); - } - - void setUpFountainRegion() throws Exception { - DefaultDomain domain = new DefaultDomain(); - domain.addGroup(MEMBER_GROUP); - - ProtectedRegion region = new ProtectedCuboidRegion(FOUNTAIN_ID, - new BlockVector(0, 0, 0), new BlockVector(5, 5, 5)); - region.setMembers(domain); - manager.addRegion(region); - - fountain = region; - fountain.setParent(courtyard); - fountain.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); - fountain.setFlag(DefaultFlag.MOB_SPAWNING, StateFlag.State.ALLOW); - } - - @Test - public void testNoPriorities() throws Exception { - ApplicableRegionSet appl; - - courtyard.setPriority(0); - fountain.setPriority(0); - - appl = manager.getApplicableRegions(inCourtyard); - assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); - assertFalse(appl.allows(DefaultFlag.MOB_SPAWNING)); - appl = manager.getApplicableRegions(inFountain); - assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); - assertTrue(appl.allows(DefaultFlag.MOB_SPAWNING)); - } - - @Test - public void testPriorities() throws Exception { - ApplicableRegionSet appl; - - courtyard.setPriority(5); - fountain.setPriority(0); - - appl = manager.getApplicableRegions(inCourtyard); - assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); - appl = manager.getApplicableRegions(inFountain); - assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); - } - - @Test - public void testPriorities2() throws Exception { - ApplicableRegionSet appl; - - courtyard.setPriority(0); - fountain.setPriority(5); - - appl = manager.getApplicableRegions(inCourtyard); - assertFalse(appl.allows(DefaultFlag.MOB_SPAWNING)); - appl = manager.getApplicableRegions(inFountain); - assertTrue(appl.allows(DefaultFlag.MOB_SPAWNING)); - } -} +/* + * WorldGuard, a suite of tools for Minecraft + * Copyright (C) sk89q + * Copyright (C) WorldGuard team and contributors + * + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + +package com.sk89q.worldguard.protection; + +import com.sk89q.worldedit.BlockVector; +import com.sk89q.worldedit.BlockVector2D; +import com.sk89q.worldedit.Vector; +import com.sk89q.worldguard.TestPlayer; +import com.sk89q.worldguard.domains.DefaultDomain; +import com.sk89q.worldguard.protection.flags.DefaultFlag; +import com.sk89q.worldguard.protection.flags.StateFlag; +import com.sk89q.worldguard.protection.managers.RegionManager; +import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion; +import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; +import com.sk89q.worldguard.protection.regions.ProtectedPolygonalRegion; +import com.sk89q.worldguard.protection.regions.ProtectedRegion; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public abstract class RegionPriorityTest { + static String COURTYARD_ID = "courtyard"; + static String FOUNTAIN_ID = "fountain"; + static String NO_FIRE_ID = "nofire"; + static String MEMBER_GROUP = "member"; + static String COURTYARD_GROUP = "courtyard"; + + Vector inFountain = new Vector(2, 2, 2); + Vector inCourtyard = new Vector(7, 7, 7); + Vector outside = new Vector(15, 15, 15); + RegionManager manager; + ProtectedRegion globalRegion; + ProtectedRegion courtyard; + ProtectedRegion fountain; + TestPlayer player1; + TestPlayer player2; + + protected abstract RegionManager createRegionManager() throws Exception; + + @Before + public void setUp() throws Exception { + setUpGlobalRegion(); + + manager = createRegionManager(); + + setUpPlayers(); + setUpCourtyardRegion(); + setUpFountainRegion(); + } + + void setUpPlayers() { + player1 = new TestPlayer("tetsu"); + player1.addGroup(MEMBER_GROUP); + player1.addGroup(COURTYARD_GROUP); + + player2 = new TestPlayer("alex"); + player2.addGroup(MEMBER_GROUP); + } + + void setUpGlobalRegion() { + globalRegion = new GlobalProtectedRegion("__global__"); + } + + void setUpCourtyardRegion() { + DefaultDomain domain = new DefaultDomain(); + domain.addGroup(COURTYARD_GROUP); + + ArrayList points = new ArrayList(); + points.add(new BlockVector2D(0, 0)); + points.add(new BlockVector2D(10, 0)); + points.add(new BlockVector2D(10, 10)); + points.add(new BlockVector2D(0, 10)); + + //ProtectedRegion region = new ProtectedCuboidRegion(COURTYARD_ID, new BlockVector(0, 0, 0), new BlockVector(10, 10, 10)); + ProtectedRegion region = new ProtectedPolygonalRegion(COURTYARD_ID, points, 0, 10); + + region.setOwners(domain); + manager.addRegion(region); + + courtyard = region; + courtyard.setFlag(DefaultFlag.MOB_SPAWNING, StateFlag.State.DENY); + } + + void setUpFountainRegion() throws Exception { + DefaultDomain domain = new DefaultDomain(); + domain.addGroup(MEMBER_GROUP); + + ProtectedRegion region = new ProtectedCuboidRegion(FOUNTAIN_ID, + new BlockVector(0, 0, 0), new BlockVector(5, 5, 5)); + region.setMembers(domain); + manager.addRegion(region); + + fountain = region; + fountain.setParent(courtyard); + fountain.setFlag(DefaultFlag.FIRE_SPREAD, StateFlag.State.DENY); + fountain.setFlag(DefaultFlag.MOB_SPAWNING, StateFlag.State.ALLOW); + } + + @Test + public void testNoPriorities() throws Exception { + ApplicableRegionSet appl; + + courtyard.setPriority(0); + fountain.setPriority(0); + + appl = manager.getApplicableRegions(inCourtyard); + assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); + assertFalse(appl.allows(DefaultFlag.MOB_SPAWNING)); + appl = manager.getApplicableRegions(inFountain); + assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); + assertTrue(appl.allows(DefaultFlag.MOB_SPAWNING)); + } + + @Test + public void testPriorities() throws Exception { + ApplicableRegionSet appl; + + courtyard.setPriority(5); + fountain.setPriority(0); + + appl = manager.getApplicableRegions(inCourtyard); + assertTrue(appl.allows(DefaultFlag.FIRE_SPREAD)); + appl = manager.getApplicableRegions(inFountain); + assertFalse(appl.allows(DefaultFlag.FIRE_SPREAD)); + } + + @Test + public void testPriorities2() throws Exception { + ApplicableRegionSet appl; + + courtyard.setPriority(0); + fountain.setPriority(5); + + appl = manager.getApplicableRegions(inCourtyard); + assertFalse(appl.allows(DefaultFlag.MOB_SPAWNING)); + appl = manager.getApplicableRegions(inFountain); + assertTrue(appl.allows(DefaultFlag.MOB_SPAWNING)); + } +} diff --git a/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/protection/regions/RegionIntersectTest.java diff --git a/src/test/java/com/sk89q/worldguard/util/CommandFilterTest.java b/worldguard-legacy/src/test/java/com/sk89q/worldguard/util/CommandFilterTest.java similarity index 100% rename from src/test/java/com/sk89q/worldguard/util/CommandFilterTest.java rename to worldguard-legacy/src/test/java/com/sk89q/worldguard/util/CommandFilterTest.java diff --git a/worldguard-legacy/worldguard-legacy.iml b/worldguard-legacy/worldguard-legacy.iml new file mode 100644 index 00000000..40d4d92f --- /dev/null +++ b/worldguard-legacy/worldguard-legacy.iml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/worldguard-sponge/build.gradle b/worldguard-sponge/build.gradle new file mode 100644 index 00000000..db5786f3 --- /dev/null +++ b/worldguard-sponge/build.gradle @@ -0,0 +1,16 @@ +apply plugin: 'eclipse' +apply plugin: 'idea' + +dependencies { + compile project(':worldguard-core') + compile 'org.spongepowered:spongeapi:2.1-SNAPSHOT' +} + +shadowJar { + dependencies { + include(dependency(':worldguard-core')) + } + +} + +build.dependsOn(shadowJar) diff --git a/worldguard-sponge/worldguard-sponge.iml b/worldguard-sponge/worldguard-sponge.iml new file mode 100644 index 00000000..2fceeb4e --- /dev/null +++ b/worldguard-sponge/worldguard-sponge.iml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file