diff --git a/build.gradle b/build.gradle index ec9dfc7f..86052d65 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ buildscript { allprojects { group = 'com.sk89q.worldguard' - version = '7.0.0-SNAPSHOT' + version = '7.0.0' } if (!project.hasProperty("artifactory_contextUrl")) ext.artifactory_contextUrl = "http://localhost" @@ -84,10 +84,10 @@ subprojects { repositories { mavenLocal() mavenCentral() - maven { url "http://repo.spongepowered.org/maven/" } + maven { url "https://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" } + maven { url "https://maven.sk89q.com/repo/" } + maven { url "https://repo.maven.apache.org/maven2" } } if (JavaVersion.current().isJava8Compatible()) { diff --git a/settings.gradle b/settings.gradle index bad689fe..2b53ed70 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,3 @@ rootProject.name = 'worldguard' -include 'worldguard-core', 'worldguard-legacy' +include 'worldguard-core', 'worldguard-bukkit' diff --git a/worldguard-legacy/build.gradle b/worldguard-bukkit/build.gradle similarity index 100% rename from worldguard-legacy/build.gradle rename to worldguard-bukkit/build.gradle diff --git a/worldguard-legacy/contrib/blacklist_table.sql b/worldguard-bukkit/contrib/blacklist_table.sql similarity index 100% rename from worldguard-legacy/contrib/blacklist_table.sql rename to worldguard-bukkit/contrib/blacklist_table.sql diff --git a/worldguard-legacy/contrib/region_manual_update_20110325.sql b/worldguard-bukkit/contrib/region_manual_update_20110325.sql similarity index 100% rename from worldguard-legacy/contrib/region_manual_update_20110325.sql rename to worldguard-bukkit/contrib/region_manual_update_20110325.sql diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitConfigurationManager.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitDebugHandler.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitOfflinePlayer.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitRegionContainer.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitStringMatcher.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldConfiguration.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/ProtectionQuery.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/chest/BukkitSignChestProtection.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/BulkEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/DelegateEvents.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/Handleable.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/AbstractBlockEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/BreakBlockEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/PlaceBlockEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/block/UseBlockEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelAttempt.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogger.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/CancelLogging.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockBreakEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingBlockPlaceEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingEntityDamageByEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/debug/LoggingPlayerInteractEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/AbstractEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DamageEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/DestroyEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/SpawnEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/entity/UseEntityEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/inventory/UseItemEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/event/player/ProcessPlayerEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/TargetMatcherSet.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/internal/WGMetadata.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/AbstractListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlacklistListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockStateAsBlockFunction.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BuildPermissionListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/ChestProtectionListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/DebuggingListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/InvincibilityListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerModesListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardBlockListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardCommandBookListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardHangingListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardPlayerListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardServerListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardVehicleListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWeatherListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardWorldListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldRulesListener.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonExtendKey.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/BlockPistonRetractKey.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/EventDebounce.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/AbstractEventDebounce.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/BlockEntityEventDebounce.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/EntityEntityEventDebounce.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/DisallowedPVPEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/protection/events/flags/FlagContextCreateEvent.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Blocks.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Events.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/HandlerTracer.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/InteropUtils.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/logging/ClassSourceValidator.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/CancelReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PerformanceReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/PluginReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/SchedulerReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServerReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/ServicesReport.java diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java b/worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java similarity index 100% rename from worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java rename to worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/report/WorldReport.java diff --git a/worldguard-legacy/src/main/resources/defaults/blacklist.txt b/worldguard-bukkit/src/main/resources/defaults/blacklist.txt similarity index 100% rename from worldguard-legacy/src/main/resources/defaults/blacklist.txt rename to worldguard-bukkit/src/main/resources/defaults/blacklist.txt diff --git a/worldguard-legacy/src/main/resources/defaults/config.yml b/worldguard-bukkit/src/main/resources/defaults/config.yml similarity index 100% rename from worldguard-legacy/src/main/resources/defaults/config.yml rename to worldguard-bukkit/src/main/resources/defaults/config.yml diff --git a/worldguard-legacy/src/main/resources/defaults/config_world.yml b/worldguard-bukkit/src/main/resources/defaults/config_world.yml similarity index 100% rename from worldguard-legacy/src/main/resources/defaults/config_world.yml rename to worldguard-bukkit/src/main/resources/defaults/config_world.yml diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql b/worldguard-bukkit/src/main/resources/migrations/region/mysql/V1__Initial.sql similarity index 100% rename from worldguard-legacy/src/main/resources/migrations/region/mysql/V1__Initial.sql rename to worldguard-bukkit/src/main/resources/migrations/region/mysql/V1__Initial.sql diff --git a/worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql b/worldguard-bukkit/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql similarity index 100% rename from worldguard-legacy/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql rename to worldguard-bukkit/src/main/resources/migrations/region/mysql/V2__Bug_fix_and_UUID.sql diff --git a/worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql b/worldguard-bukkit/src/main/resources/migrations/region/sqlite/V1__Initial.sql similarity index 100% rename from worldguard-legacy/src/main/resources/migrations/region/sqlite/V1__Initial.sql rename to worldguard-bukkit/src/main/resources/migrations/region/sqlite/V1__Initial.sql diff --git a/worldguard-legacy/src/main/resources/plugin.yml b/worldguard-bukkit/src/main/resources/plugin.yml similarity index 100% rename from worldguard-legacy/src/main/resources/plugin.yml rename to worldguard-bukkit/src/main/resources/plugin.yml