diff --git a/.gitignore b/.gitignore index cf0be7c8..00d16d4e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,4 +14,6 @@ manifest.mf /oldcmds .settings -*.bat \ No newline at end of file +*.bat +/target +/true \ No newline at end of file diff --git a/README.html b/README.html new file mode 100644 index 00000000..70f1ebf8 --- /dev/null +++ b/README.html @@ -0,0 +1,111 @@ + + + +WorldGuard ${version} + + + + +
+ +

WorldGuard ${version}

+

Thanks for choosing WorldGuard!

+

First Steps

+ +

Now, to begin, you want to:

+
    +
  1. Install the plugin: Copy WorldGuard.jar into your Bukkit server's "plugins" directory. If the folder doesn't exist, create it.
    2. +
  2. Change the configuration: Run your server once (with WorldGuard) to generate the default configuration files: +
      +
    • Global configuration: A config.yml file is generated inside "plugins/WorldGuard" containing global settings that affect all worlds. There is currently only one applicable setting in this file.
      • +
    • World configurations: For each world, a config.yml will be generated inside "plugins/WorldGuard/worlds/<world>/config.yml". Edit this file to disable fire and change other world-specific settings. Each world's configuration is entirely separate from one another
      • +
    +
    3. + Use /wg reload in the console to reload the configuration. +
  3. Setup the blacklist Optional: For each world folder (see above), there is a blacklist.txt file that is generated. See the wiki for information about WorldGuard's blacklist.
    4. +
  4. Check out the spreadsheet: Sadly WorldGuard is not 100% complete. It's nearly there, but documentation is also currently lacking. Be sure to read the information on the checklist.
    5. +
+

Gotcha: You need to have WorldEdit installed! It's used by WorldGuard in a number of places. If you don't want to install the plugin, that's okay — just put WorldEdit.jar into your Bukkit root folder (outside of plugins/) and WorldGuard will still be able use it.

+

Be sure to:

+ +

Contributing

+

WorldGuard is entirely open source! You can download all of the plugin code to learn from it, modify it for your own self, or even contribute back!

+ +

The code is covered under the GNU General Public License v3.

+

Maven information: ${groupId}/${artifactId}/${version}

+
+ + \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 00000000..e0034fe2 --- /dev/null +++ b/README.md @@ -0,0 +1,25 @@ +WorldGuard +========== + +WorldGuard protects your Minecraft server. As Minecraft's oldest surviving world protection mod, you know you're in safe hands. + +Compiling +--------- + +You need to have Maven installed (http://maven.apache.org). Once installed, +simply run: + + mvn clean install + +Maven will automatically download dependencies for you. Note: For that to work, +be sure to add Maven to your "PATH". + +Contributing +------------ + +We happily accept contributions. The best way to do this is to fork WorldGuard +on GitHub, add your changes, and then submit a pull request. We'll look at it, +make comments, and merge it into WorldGuard if everything works out. + +By submitting code, you agree to place to license your code under the +GNU General Public License v3. \ No newline at end of file diff --git a/README.txt b/README.txt deleted file mode 100644 index 37bd0848..00000000 --- a/README.txt +++ /dev/null @@ -1,23 +0,0 @@ -WorldGuard -Copyright (c) 2010, 2011 sk89q -Licensed under the GNU Lesser General Public License v3 - -Introduction ------------- - -WorldGuard protects your server! - -Documentation can be found at: -http://wiki.sk89q.com/wiki/WorldGuard - -Thanks ------- - -While I would like to thank everyone for their support, I would like to -say thanks to the following individuals for their direct -contributions to WorldGuard: - -- Sturmeh, for contributing the original durability workaround -- Meaglin, for changing the on flow hook at my request -- Dinnerbone, for implementing the on item pick up hook at my request, - and also for figuring out the durability bug in the process diff --git a/build.xml b/build.xml deleted file mode 100644 index bb60fcfa..00000000 --- a/build.xml +++ /dev/null @@ -1,111 +0,0 @@ - - WorldGuard fixes bugs with Minecraft SMP and provides for - protection. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/javadoc.xml b/javadoc.xml deleted file mode 100644 index 1af87fc6..00000000 --- a/javadoc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/lib/iConomy.jar b/lib/iConomy.jar deleted file mode 100644 index 1143cbad..00000000 Binary files a/lib/iConomy.jar and /dev/null differ diff --git a/lib/prtree.jar b/lib/prtree.jar deleted file mode 100644 index 7e462416..00000000 Binary files a/lib/prtree.jar and /dev/null differ diff --git a/permissions_list.txt b/permissions_list.txt deleted file mode 100644 index 61adb98f..00000000 --- a/permissions_list.txt +++ /dev/null @@ -1,68 +0,0 @@ -worldguard.god.other -worldguard.god.self - -worldguard.slay.other -worldguard.slay.self - -worldguard.heal.other -worldguard.heal.self - -worldguard.stack - -worldguard.stopfire - -worldguard.allowfire - -worldguard.locate - -worldguard.region.flag.ownregions -worldguard.region.flag.memberregions -worldguard.region.flag.foreignregions - -worldguard.region.info.ownregions -worldguard.region.info.memberregions -worldguard.region.info.foreignregions - -worldguard.region.list - -worldguard.region.load - -worldguard.region.addowner.own -worldguard.region.addowner.all - -worldguard.region.addmember.own -worldguard.region.addmember.all - -worldguard.region.removeowner.own -worldguard.region.removeowner.all - -worldguard.region.removemember.own -worldguard.region.removemember.all - -worldguard.region.save - -worldguard.region.setparent.own -worldguard.region.setparent.all - -worldguard.region.priority.own -worldguard.region.priority.all - -worldguard.region.bypass - -worldguard.reloadwg - -worldguard.region.delete.own -worldguard.region.delete.all - -worldguard.region.define - -worldguard.region.claim - -worldguard.tpregion -worldguard.tpregion.spawn -worldguard.tpregion.override - -worldguard.buyregion - -worldguard.notify -worldguard.notify_onenter diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..89d832ea --- /dev/null +++ b/pom.xml @@ -0,0 +1,136 @@ + + + 4.0.0 + com.sk89q + worldguard + 5.0.0-SNAPSHOT + WorldGuard + WorldGuard protects your Minecraft servers + + + scm:git:git://github.com/sk89q/worldguard.git + https://github.com/sk89q/worldguard + scm:git:git@github.com:sk89q/worldguard.git + + + + + + sk89q-mvn2 + http://mvn2.sk89q.com/repo + + + + bukkit-repo + http://repo.bukkit.org/artifactory/repo + + + + + + + com.sk89q + worldedit + 4.4.2 + + + + + org.bukkit + bukkit + 0.0.1-SNAPSHOT + + + + + com.nijikokun + iconomy + 5.0 + + + org.khelekore + prtree + 1.4 + + + + + ${basedir}/src/main/java + + + + + . + true + ${basedir}/src/main/resources/ + + plugin.yml + + + + defaults/ + true + ${basedir}/src/main/resources/ + + config.yml + config_world.yml + blacklist.txt + + + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + true + true + + true + true + + + WorldEdit.jar WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar + + + + + + + + maven-assembly-plugin + 2.2-beta-2 + + ${basedir}/src/main/assembly/default.xml + + + + + + org.apache.maven.plugins + maven-release-plugin + 2.1 + + assembly:assembly + assembly:assembly + + + + + \ No newline at end of file diff --git a/src/main/assembly/default.xml b/src/main/assembly/default.xml new file mode 100644 index 00000000..ad5db152 --- /dev/null +++ b/src/main/assembly/default.xml @@ -0,0 +1,34 @@ + + + false + + tar.gz + tar.bz2 + zip + + + + ${project.build.directory}/${artifactId}-${project.version}.jar + WorldGuard.jar + / + false + + + README.html + / + true + + + + + + LICENSE.txt + NOTICE.txt + blacklist_table.sql + + + + \ No newline at end of file diff --git a/src/au/com/bytecode/opencsv/CSVParser.java b/src/main/java/au/com/bytecode/opencsv/CSVParser.java similarity index 100% rename from src/au/com/bytecode/opencsv/CSVParser.java rename to src/main/java/au/com/bytecode/opencsv/CSVParser.java diff --git a/src/au/com/bytecode/opencsv/CSVReader.java b/src/main/java/au/com/bytecode/opencsv/CSVReader.java similarity index 100% rename from src/au/com/bytecode/opencsv/CSVReader.java rename to src/main/java/au/com/bytecode/opencsv/CSVReader.java diff --git a/src/au/com/bytecode/opencsv/CSVWriter.java b/src/main/java/au/com/bytecode/opencsv/CSVWriter.java similarity index 100% rename from src/au/com/bytecode/opencsv/CSVWriter.java rename to src/main/java/au/com/bytecode/opencsv/CSVWriter.java diff --git a/src/au/com/bytecode/opencsv/ResultSetHelper.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java similarity index 100% rename from src/au/com/bytecode/opencsv/ResultSetHelper.java rename to src/main/java/au/com/bytecode/opencsv/ResultSetHelper.java diff --git a/src/au/com/bytecode/opencsv/ResultSetHelperService.java b/src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java similarity index 100% rename from src/au/com/bytecode/opencsv/ResultSetHelperService.java rename to src/main/java/au/com/bytecode/opencsv/ResultSetHelperService.java diff --git a/src/com/sk89q/worldguard/LocalPlayer.java b/src/main/java/com/sk89q/worldguard/LocalPlayer.java similarity index 100% rename from src/com/sk89q/worldguard/LocalPlayer.java rename to src/main/java/com/sk89q/worldguard/LocalPlayer.java diff --git a/src/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java b/src/main/java/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java similarity index 100% rename from src/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java rename to src/main/java/com/sk89q/worldguard/TickSyncDelayLoggerFilter.java diff --git a/src/com/sk89q/worldguard/blacklist/Blacklist.java b/src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/Blacklist.java rename to src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java diff --git a/src/com/sk89q/worldguard/blacklist/BlacklistEntry.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/BlacklistEntry.java rename to src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java diff --git a/src/com/sk89q/worldguard/blacklist/BlacklistLogger.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/BlacklistLogger.java rename to src/main/java/com/sk89q/worldguard/blacklist/BlacklistLogger.java diff --git a/src/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java b/src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java rename to src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java diff --git a/src/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java rename to src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java diff --git a/src/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java rename to src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java diff --git a/src/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java rename to src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java diff --git a/src/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java rename to src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerHandler.java diff --git a/src/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java b/src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java similarity index 100% rename from src/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java rename to src/main/java/com/sk89q/worldguard/blacklist/loggers/FileLoggerWriter.java diff --git a/src/com/sk89q/worldguard/bukkit/BukkitBlacklist.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/BukkitBlacklist.java rename to src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java diff --git a/src/com/sk89q/worldguard/bukkit/BukkitPlayer.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/BukkitPlayer.java rename to src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java diff --git a/src/com/sk89q/worldguard/bukkit/BukkitUtil.java b/src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/BukkitUtil.java rename to src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java diff --git a/src/com/sk89q/worldguard/bukkit/ConfigurationManager.java b/src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/ConfigurationManager.java rename to src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java diff --git a/src/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java b/src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java rename to src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java diff --git a/src/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java b/src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java rename to src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java diff --git a/src/com/sk89q/worldguard/bukkit/ReportWriter.java b/src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/ReportWriter.java rename to src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java diff --git a/src/com/sk89q/worldguard/bukkit/SignChestProtection.java b/src/main/java/com/sk89q/worldguard/bukkit/SignChestProtection.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/SignChestProtection.java rename to src/main/java/com/sk89q/worldguard/bukkit/SignChestProtection.java diff --git a/src/com/sk89q/worldguard/bukkit/WorldConfiguration.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/WorldConfiguration.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldConfiguration.java diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java similarity index 92% rename from src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java index 86b4fe82..9ed829a0 100644 --- a/src/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlayerListener.java @@ -99,9 +99,7 @@ public void onPlayerInteract(PlayerInteractEvent event) { } else if (event.getAction() == Action.PHYSICAL) { handlePhysicalInteract(event); } - } - -<<<<<<< HEAD + } /** * Called when a player left clicks air. * @@ -149,57 +147,7 @@ public void handleBlockLeftClick(PlayerInteractEvent event) { } } - /** -======= - /** - * Called when a player left clicks air. - * - * @param event - */ - public void handleAirLeftClick(PlayerInteractEvent event) { - //I don't think we have to do anything here yet. - return; - } - - /** - * Called when a player left clicks a block. - * - * @param event - */ - public void handleBlockLeftClick(PlayerInteractEvent event) { - if (event.isCancelled()) return; - - Player player = event.getPlayer(); - Block block = event.getClickedBlock(); - Material type = block.getType(); - World world = player.getWorld(); - - ConfigurationManager cfg = plugin.getGlobalConfiguration(); - WorldConfiguration wcfg = cfg.get(world); - - if (wcfg.useRegions) { - Vector pt = toVector(block); - RegionManager mgr = plugin.getGlobalRegionManager().get(world); - ApplicableRegionSet set = mgr.getApplicableRegions(pt); - LocalPlayer localPlayer = plugin.wrapPlayer(player); - - if (type == Material.STONE_BUTTON - || type == Material.LEVER - || type == Material.WOODEN_DOOR - || type == Material.NOTE_BLOCK) { - if (!plugin.getGlobalRegionManager().hasBypass(player, world) - && !set.allows(DefaultFlag.USE) - && !set.canBuild(localPlayer)) { - player.sendMessage(ChatColor.DARK_RED + "You don't have permission to use that in this area."); - event.setCancelled(true); - return; - } - } - } - } - - /** ->>>>>>> 19d447d67d0c4620368069a00c20812325916b2e + /** * Called when a player right clicks air. * * @param event diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java diff --git a/src/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java b/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java rename to src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/RegionCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/commands/RegionCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/RegionCommands.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java similarity index 100% rename from src/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java diff --git a/src/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java similarity index 96% rename from src/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java rename to src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java index 525ec5b2..c81ec069 100644 --- a/src/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java @@ -109,13 +109,11 @@ public static void report(CommandContext args, WorldGuardPlugin plugin, sender.sendMessage(ChatColor.YELLOW + "Now uploading to Pastebin..."); PastebinPoster.paste(report.toString(), new PasteCallback() { - @Override public void handleSuccess(String url) { // Hope we don't have a thread safety issue here sender.sendMessage(ChatColor.YELLOW + "WorldGuard report (1 hour): " + url); } - @Override public void handleError(String err) { // Hope we don't have a thread safety issue here sender.sendMessage(ChatColor.YELLOW + "WorldGuard report pastebin error: " + err); diff --git a/src/com/sk89q/worldguard/domains/DefaultDomain.java b/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java similarity index 100% rename from src/com/sk89q/worldguard/domains/DefaultDomain.java rename to src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java diff --git a/src/com/sk89q/worldguard/domains/Domain.java b/src/main/java/com/sk89q/worldguard/domains/Domain.java similarity index 100% rename from src/com/sk89q/worldguard/domains/Domain.java rename to src/main/java/com/sk89q/worldguard/domains/Domain.java diff --git a/src/com/sk89q/worldguard/domains/DomainCollection.java b/src/main/java/com/sk89q/worldguard/domains/DomainCollection.java similarity index 100% rename from src/com/sk89q/worldguard/domains/DomainCollection.java rename to src/main/java/com/sk89q/worldguard/domains/DomainCollection.java diff --git a/src/com/sk89q/worldguard/domains/GroupDomain.java b/src/main/java/com/sk89q/worldguard/domains/GroupDomain.java similarity index 100% rename from src/com/sk89q/worldguard/domains/GroupDomain.java rename to src/main/java/com/sk89q/worldguard/domains/GroupDomain.java diff --git a/src/com/sk89q/worldguard/domains/PlayerDomain.java b/src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java similarity index 100% rename from src/com/sk89q/worldguard/domains/PlayerDomain.java rename to src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java diff --git a/src/com/sk89q/worldguard/protection/ApplicableRegionSet.java b/src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java similarity index 100% rename from src/com/sk89q/worldguard/protection/ApplicableRegionSet.java rename to src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java diff --git a/src/com/sk89q/worldguard/protection/GlobalRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java similarity index 100% rename from src/com/sk89q/worldguard/protection/GlobalRegionManager.java rename to src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java diff --git a/src/com/sk89q/worldguard/protection/TimedFlagPlayerInfo.java b/src/main/java/com/sk89q/worldguard/protection/TimedFlagPlayerInfo.java similarity index 100% rename from src/com/sk89q/worldguard/protection/TimedFlagPlayerInfo.java rename to src/main/java/com/sk89q/worldguard/protection/TimedFlagPlayerInfo.java diff --git a/src/com/sk89q/worldguard/protection/TimedFlagsTimer.java b/src/main/java/com/sk89q/worldguard/protection/TimedFlagsTimer.java similarity index 100% rename from src/com/sk89q/worldguard/protection/TimedFlagsTimer.java rename to src/main/java/com/sk89q/worldguard/protection/TimedFlagsTimer.java diff --git a/src/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java b/src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java similarity index 100% rename from src/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java rename to src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java diff --git a/src/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java similarity index 100% rename from src/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java rename to src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java diff --git a/src/com/sk89q/worldguard/protection/databases/CSVDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java similarity index 99% rename from src/com/sk89q/worldguard/protection/databases/CSVDatabase.java rename to src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java index 3f3e5bbb..78054d41 100644 --- a/src/com/sk89q/worldguard/protection/databases/CSVDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java @@ -68,7 +68,6 @@ public CSVDatabase(File file) { /** * Saves the database. */ - @Override public void save() throws IOException { throw new UnsupportedOperationException("CSV format is no longer implemented"); } @@ -76,7 +75,6 @@ public void save() throws IOException { /** * Load the database from file. */ - @Override public void load() throws IOException { Map regions = new HashMap(); diff --git a/src/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java similarity index 100% rename from src/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java rename to src/main/java/com/sk89q/worldguard/protection/databases/ProtectionDatabase.java diff --git a/src/com/sk89q/worldguard/protection/databases/RegionDBUtil.java b/src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java similarity index 100% rename from src/com/sk89q/worldguard/protection/databases/RegionDBUtil.java rename to src/main/java/com/sk89q/worldguard/protection/databases/RegionDBUtil.java diff --git a/src/com/sk89q/worldguard/protection/databases/YAMLDatabase.java b/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java similarity index 96% rename from src/com/sk89q/worldguard/protection/databases/YAMLDatabase.java rename to src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java index f04da247..d6da9d19 100644 --- a/src/com/sk89q/worldguard/protection/databases/YAMLDatabase.java +++ b/src/main/java/com/sk89q/worldguard/protection/databases/YAMLDatabase.java @@ -53,7 +53,6 @@ public YAMLDatabase(File file) { config = new Configuration(file); } - @Override public void load() throws IOException { config.load(); @@ -183,7 +182,6 @@ private DefaultDomain parseDomain(ConfigurationNode node) { return domain; } - @Override public void save() throws IOException { config.clear(); @@ -274,12 +272,10 @@ private void setDomainData(Map domainData, domainData.put(key, list); } - @Override public Map getRegions() { return regions; } - @Override public void setRegions(Map regions) { this.regions = regions; } diff --git a/src/com/sk89q/worldguard/protection/flags/BooleanFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/BooleanFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/DefaultFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java similarity index 90% rename from src/com/sk89q/worldguard/protection/flags/DefaultFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java index 79592902..d10e0e1e 100644 --- a/src/com/sk89q/worldguard/protection/flags/DefaultFlag.java +++ b/src/main/java/com/sk89q/worldguard/protection/flags/DefaultFlag.java @@ -57,20 +57,11 @@ public final class DefaultFlag { public static final DoubleFlag PRICE = new DoubleFlag("price"); public static final Flag[] flagsList = new Flag[] { -<<<<<<< HEAD PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, SLEEP, TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, CHEST_ACCESS, WATER_FLOW, LAVA_FLOW, USE, PLACE_VEHICLE, GREET_MESSAGE, FAREWELL_MESSAGE, NOTIFY_GREET, NOTIFY_FAREWELL, DENY_SPAWN, HEAL_DELAY, HEAL_AMOUNT, TELE_LOC, TELE_PERM, SPAWN_LOC, SPAWN_PERM, BUYABLE, PRICE -======= - PASSTHROUGH, BUILD, PVP, MOB_DAMAGE, MOB_SPAWNING, CREEPER_EXPLOSION, - TNT, LIGHTER, FIRE_SPREAD, LAVA_FIRE, LIGHTNING, CHEST_ACCESS, - WATER_FLOW, LAVA_FLOW, USE, PLACE_VEHICLE, GREET_MESSAGE, - FAREWELL_MESSAGE, NOTIFY_GREET, NOTIFY_FAREWELL, DENY_SPAWN, - HEAL_DELAY, HEAL_AMOUNT, TELE_LOC,TELE_PERM, SPAWN_LOC, SPAWN_PERM, - BUYABLE, PRICE, SLEEP ->>>>>>> 19d447d67d0c4620368069a00c20812325916b2e }; private DefaultFlag() { diff --git a/src/com/sk89q/worldguard/protection/flags/DoubleFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/DoubleFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/Flag.java b/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/Flag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/Flag.java diff --git a/src/com/sk89q/worldguard/protection/flags/IntegerFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/IntegerFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java b/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java rename to src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java diff --git a/src/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/RegionGroupFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/StateFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/StateFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/StringFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/StringFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java diff --git a/src/com/sk89q/worldguard/protection/flags/VectorFlag.java b/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java similarity index 100% rename from src/com/sk89q/worldguard/protection/flags/VectorFlag.java rename to src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java diff --git a/src/com/sk89q/worldguard/protection/managers/FlatRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java similarity index 100% rename from src/com/sk89q/worldguard/protection/managers/FlatRegionManager.java rename to src/main/java/com/sk89q/worldguard/protection/managers/FlatRegionManager.java diff --git a/src/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java similarity index 100% rename from src/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java rename to src/main/java/com/sk89q/worldguard/protection/managers/PRTreeRegionManager.java diff --git a/src/com/sk89q/worldguard/protection/managers/RegionManager.java b/src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java similarity index 100% rename from src/com/sk89q/worldguard/protection/managers/RegionManager.java rename to src/main/java/com/sk89q/worldguard/protection/managers/RegionManager.java diff --git a/src/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java similarity index 100% rename from src/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java rename to src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java diff --git a/src/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java similarity index 100% rename from src/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java rename to src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java diff --git a/src/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java similarity index 100% rename from src/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java rename to src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java diff --git a/src/com/sk89q/worldguard/protection/regions/ProtectedRegion.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java similarity index 100% rename from src/com/sk89q/worldguard/protection/regions/ProtectedRegion.java rename to src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java diff --git a/src/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java b/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java similarity index 100% rename from src/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java rename to src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java diff --git a/src/com/sk89q/worldguard/util/ArrayReader.java b/src/main/java/com/sk89q/worldguard/util/ArrayReader.java similarity index 100% rename from src/com/sk89q/worldguard/util/ArrayReader.java rename to src/main/java/com/sk89q/worldguard/util/ArrayReader.java diff --git a/src/com/sk89q/worldguard/util/LogListBlock.java b/src/main/java/com/sk89q/worldguard/util/LogListBlock.java similarity index 100% rename from src/com/sk89q/worldguard/util/LogListBlock.java rename to src/main/java/com/sk89q/worldguard/util/LogListBlock.java diff --git a/src/com/sk89q/worldguard/util/PastebinPoster.java b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java similarity index 97% rename from src/com/sk89q/worldguard/util/PastebinPoster.java rename to src/main/java/com/sk89q/worldguard/util/PastebinPoster.java index 2043be1a..3224a0a5 100644 --- a/src/com/sk89q/worldguard/util/PastebinPoster.java +++ b/src/main/java/com/sk89q/worldguard/util/PastebinPoster.java @@ -52,7 +52,6 @@ public PasteProcessor(String code, PasteCallback callback) { this.callback = callback; } - @Override public void run() { HttpURLConnection conn = null; OutputStream out = null; diff --git a/src/com/sk89q/worldguard/util/RegionUtil.java b/src/main/java/com/sk89q/worldguard/util/RegionUtil.java similarity index 100% rename from src/com/sk89q/worldguard/util/RegionUtil.java rename to src/main/java/com/sk89q/worldguard/util/RegionUtil.java diff --git a/src/com/sk89q/worldguard/util/yaml/Configuration.java b/src/main/java/com/sk89q/worldguard/util/yaml/Configuration.java similarity index 100% rename from src/com/sk89q/worldguard/util/yaml/Configuration.java rename to src/main/java/com/sk89q/worldguard/util/yaml/Configuration.java diff --git a/src/com/sk89q/worldguard/util/yaml/ConfigurationException.java b/src/main/java/com/sk89q/worldguard/util/yaml/ConfigurationException.java similarity index 100% rename from src/com/sk89q/worldguard/util/yaml/ConfigurationException.java rename to src/main/java/com/sk89q/worldguard/util/yaml/ConfigurationException.java diff --git a/src/com/sk89q/worldguard/util/yaml/ConfigurationNode.java b/src/main/java/com/sk89q/worldguard/util/yaml/ConfigurationNode.java similarity index 100% rename from src/com/sk89q/worldguard/util/yaml/ConfigurationNode.java rename to src/main/java/com/sk89q/worldguard/util/yaml/ConfigurationNode.java diff --git a/blacklist.txt b/src/main/resources/blacklist.txt similarity index 100% rename from blacklist.txt rename to src/main/resources/blacklist.txt diff --git a/config.yml b/src/main/resources/config.yml similarity index 100% rename from config.yml rename to src/main/resources/config.yml diff --git a/config_world.yml b/src/main/resources/config_world.yml similarity index 100% rename from config_world.yml rename to src/main/resources/config_world.yml diff --git a/plugin.yml b/src/main/resources/plugin.yml similarity index 94% rename from plugin.yml rename to src/main/resources/plugin.yml index b082b9e2..0572cd2c 100644 --- a/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: WorldGuard main: com.sk89q.worldguard.bukkit.WorldGuardPlugin -version: WGVERSIONMACRO +version: "${project.version}" commands: stopfire: description: Halts all fire spread until it is disabled or the server is restarted