Merge branch 'refs/heads/version/7.0.x'

# Conflicts:
#	buildSrc/src/main/kotlin/GradleExtras.kt
#	buildSrc/src/main/kotlin/LibsConfig.kt
#	buildSrc/src/main/kotlin/PlatformConfig.kt
#	gradle.properties
#	worldguard-libs/bukkit/build.gradle.kts

.gitattributes

@@ -1,2 +1,34 @@
-*.java   diff=java
-
+* text=auto eol=lf
+# Force Batch files to CRLF
+*.bat eol=crlf -text
+
+# Java sources
+*.java          text diff=java
+*.kt            text diff=java
+*.gradle        text diff=java
+*.gradle.kts    text diff=java
+
+# These files are text and should be normalized (Convert crlf => lf)
+*.css           text diff=css
+*.df            text
+*.htm           text diff=html
+*.html          text diff=html
+*.js            text
+*.jsp           text
+*.jspf          text
+*.jspx          text
+*.properties    text
+*.tld           text
+*.tag           text
+*.tagx          text
+*.xml           text
+
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.class         binary
+*.dll           binary
+*.ear           binary
+*.jar           binary
+*.so            binary
+*.war           binary
+*.jks           binary

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: enginehub

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,93 @@
+name: Bug report
+description: Report a way in which WorldGuard is not working as intended
+labels: ['type:bug', 'status:pending']
+
+body:
+- type: markdown
+  attributes:
+    value: |
+      Please note that this is only for bugs, help with installation or other types of support should
+      be taken to the Discord Guild instead.
+  
+- type: input
+  attributes:
+    label: WorldEdit Version
+    description: The full version of WorldEdit, can be found by using `/we version`.
+    placeholder: e.g. 7.2.3 or 7.3.0-SNAPSHOT
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: WorldGuard Version
+    description: The full version of WorldGuard, can be found by using `/wg version`.
+    placeholder: e.g. 7.0.5 or 7.0.6-SNAPSHOT
+  validations:
+    required: true
+
+- type: input
+  attributes:
+    label: Platform Version
+    description: |
+      The version of the platform you are on, i.e. Spigot or Paper.
+      Please ensure you are running up-to-date software before making a bug report.
+      Old versions, paper forks or hybrids will receive little to no support.
+    placeholder: e.g. git-Spigot-21fe707-e1ebe52, git-Paper-463
+  validations:
+    required: true
+
+- type: checkboxes
+  id: confirmations
+  attributes:
+    label: Confirmations
+    description: Please confirm the following before submitting the bug. Your report will be closed if you are running hybrids or old software.
+    options:
+      - label: I am using the most recent Minecraft release.
+        required: true
+      - label: I am using a version of WorldEdit compatible with my Minecraft version.
+        required: true
+      - label: I am using a version of WorldGuard compatible with my Minecraft version.
+        required: true
+      - label: I am using the latest or recommended version of my platform software.
+        required: true
+      - label: I am NOT using a hybrid server, e.g. a server that combines Bukkit and Forge. Examples include Arclight, Mohist, and Cardboard.
+        required: true
+      - label: I am NOT using a fork of WorldEdit, such as FastAsyncWorldEdit (FAWE) or AsyncWorldEdit (AWE)
+        required: true
+
+- type: textarea
+  attributes:
+    label: Bug Description
+    description: A clear and concise description of what the bug is.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Expected Behavior
+    description: The behavior that you expected, instead of the bugged behavior that occurs.
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Reproduction Steps
+    description: Steps to reproduce the behavior.
+    value: |
+      1. ...
+      2. ...
+  validations:
+    required: true
+
+
+- type: input
+  attributes:
+    label: Optional WorldGuard-Report
+    description: Link to WorldGuard Region report for bugs with regions, received with `/wg report -p`
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything Else?
+    description: Add any additional context you can provide below.

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: EngineHub Discord
+    url: https://discord.gg/EngineHub
+    about: Please ask and answer questions here.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -0,0 +1,35 @@
+name: Feature request
+description: Suggest an idea for WorldGuard
+labels: ['type:feature-request', 'status:pending']
+
+body:
+- type: textarea
+  attributes:
+    label: The Problem
+    description: >
+      What is making your WorldGuard experience sub-optimal? This should be something that
+      cannot be easily solved by existing WorldGuard features.
+    placeholder: It's hard to ... ; I'm unable to ...
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: A Solution
+    description: What is your proposed solution to the above problem?
+  validations:
+    required: true
+
+- type: textarea
+  attributes:
+    label: Alternatives
+    description: |
+      Alternative solutions or workarounds to the problem.
+      You should also describe why these are not preferable to the given solution.
+  validations:
+    required: false
+
+- type: textarea
+  attributes:
+    label: Anything Else?
+    description: Add any additional context you can provide below.

.gitignore

@@ -1,13 +1,19 @@
 .classpath
 .project
-.settings
-target
+.settings/
+target/
 
 .DS_Store
-*.iml
-.idea
 
-/bin
-/dependency-reduced-pom.xml
+**/*.iml
+**/.idea
+
+bin/
+dependency-reduced-pom.xml
 *-private.sh
 
+.gradle/
+**/build/
+out/
+
+scripts/

.travis.yml

@@ -1,7 +0,0 @@
-language: java
-jdk:
-  - oraclejdk7
-  - openjdk7
-  - openjdk6
-notifications:
-  email: false

CHANGELOG.txt

@@ -1,614 +0,0 @@
-5.9
-- Added a config option to allow explosion flags to only prevent block damage
-- Added allow-tamed-spawns setting, on by default. This will stop WorldGuard
-    from culling tamed animals.
-- Added config option and flag to prevent soil from drying naturally.
-- Added formatting codes, &k/l/m/n/o and &x (reset).
-- Added snow-fall-blocks option to config to restrict snow fall to certain blocks
-- Allow players to add newlines (\n) via command, not just manually in yml.
-- Allow the console to load/save all region managers with one command.
-- Changed entity report format slightly.
-- Check bypass perms for item-drop flag.
-- Check for entities and projectiles removing items from frames too.
-- Fix being able to use bonemeal to turn tall grass into double plants.
-- Fix number of arguments for migratedb command.
-- Fixed addowner/addmember commands adding command artifacts. Specifically, 
-    "-w <world>" will no longer be added when using it.
-- Fixed milking cows in protected areas due to changes in Bukkit.
-- Fixed ProtectedCuboidRegion::getPoints() returning points in wrong order.
-- Fixed snowman trails being treated as snow fall.
-- Make /rg list default to own regions if the player doesn't have permission otherwise.
-- Protected items in item frames in protected regions.
-- Resolved an issue where explosions of type OTHER_EXPLOSION were ignoring the world 
-    configuration settings.
-- Send item-use blacklist event when right-clicking entities.
-- Transformed the BlockFadeEvent handler into a switch.
-
-5.8:
-- BREAKING CHANGE: This version has been built for versions of Bukkit for MC 1.6.1 and
-  newer. Do not try to use this version of WG on an older Bukkit version.
-- Added support for Minecraft 1.6+. Actual support of new 1.6 additions is dependant on
-    Bukkit. Please use a newer build of Bukkit if, for example, you seem to be unable to
-    add "Horses" to your lists of entities.
-- Added mobs.disable-snowman-trails to disable the trails left by walking snowmen.
-- Added -a flag to /region removeowner and /region removemember to remove all objects.
-- Teleporting is now handled by entry/exit flags. If this is causing people to get
-    entirely stuck inside entry/exit deny regions, set the new setting
-    'use-player-teleports' to 'false' in your configuration.
-- Updated formatting for region commands, especially /region info.
-- Changed permissions checking for /region commands to be more consistent, checking for
-    region IDs as a sub-node. This means that if some permissions for some region
-    commands no longer work, add '.*' to the end of permission lines for WG in your
-    permission plugin.
-
-5.7.5:
-- Refixed a few issues from 5.7.4.
-
-5.7.4:
-- BREAKING CHANGE: Removed the cyan "**" in front of greeting
-  and farewell messages to allow more customizability. You can
-  re-add them by adding "&c**" to the flag.
-- Fixed an issue enderpearling inside exit/entry deny regions.
-- Added checks to players teleporting in and out of exit/entry regions. 
-- Fix bad matching in blocked and allowed command flags.
-- Fixed heal flag bugs when player max health was increased. 
-- Add fishing to xp blocker.
-- Applied other-explosion flag to entity damage as well.
-- Fixed an issue with interaction that should allow blacklisting item use actions with no block involved (eg fishing rods, potions) 
-- Fix witherskull/fireball settings not being differentiated in one case 
-- Allow cow milking in no-build areas
-- Fix infinite durability breaking items instantly.
-
-5.7.3:
-- Fixed the error caused by Bukkit's change of the TNT minecart API.
-
-5.7.2:
-- Updated to MineCraft 1.5.
-- Added TNT Minecart support. They are handled with the same flags/settings as TNT.
-- Added mining and smelting xp handling to the xp drops flag and setting.
-- Fixed a few edge cases for placing items on region borders.
-- Legacy: Fixed issue with //stack not respecting item metadata.
-
-5.7.1:
-- Added a vine growth config option and flag.
-- Added support for many commands to be used from console.
-  Usage is with -w flag and a world name e.g.
-  /rg addmem <id> <player> -w <worldname>
-  /rg flag <id> <flag> -w <worldname> <flagvalue>
-- Fixed bug that blocks placing plants in flower pots.
-- Fixed permissions check for /rg tp
-- Fixed enderchests not being accessible (they are now part of the USE flag)
-- Fixed an issue with slabs being placable in protected regions. This was
-  also fixed in CraftBukkit but has been left in for users running other versions.
-- Fixed wither skulls being handled with other fireballs, despite having their own settings.
-- Fixed item frames being placable on region borders.
-- Fixed a bug that made explosions more ineffective than they should have been.
-- Fixed bonemeal usage in protected regions.
-- Fixed special minecarts being placable in protected regions.
-- Fixed bugs being placable on region borders.
-- Fixed wolves bypassing pvp flags.
-
-5.7:
-- Fixed thread sync issue with FlagStateManager.
-- Fixed dragon egg region protection not working in certain cases.
-- Added beacon and anvil usage protection in regions.
-- Add mobs.block-enderdragon-portal-creation to stop enderdragons
-    from making portals on death.
-- Fix TNT being lethal in some case when damage was disabled.
-- Fix snowballs and enderpearls being able to knock players back in
-    pvp deny regions.
-- Add subcommand support for allowed and blocked command flags.
-- Add max-players-allowed and max-players-reject-message flags to
-    limit the numbers of players in a region.
-- Fix players being able to plant cocoa beans in protected areas.
-- Add an enderpearl flag to prevent players from teleporting to and
-    from regions.
-- Added mobs.block-other-explosions config setting and other-explosion
-    flag to block explosions caused by uncovered things, such as other
-    plugins. (It doesn't actually have to be a mob)
-- Fix mob damage setting and flag not blocking the DoT wither effect.
-- Ghast fireball flag will not block blaze fireballs from lighting things
-    on fire.
-- Fixed players without region permissions being able to trigger tripwires,
-    use enderchests, use wooden buttons, and put plants in flower pots.
-- Added mobs.block-zombie-door-destruction setting to stop zombies from
-    breaking down doors while difficulty is set to hard.
-
-Thank you to thvortex, Dilandau, tophathacker, and Dark_arc for their contributions this release.
-
-5.6.5:
-- Fixed a regression that caused paintings and item frames to no longer be properly
-    protected.
-
-5.6.4:
-- Added mobs.block-above-ground-slimes to block slimes spawning naturally above ground.
-- Added security.deop-everyone-on-join to de-op all players when they join.
-- Added security.block-in-game-op-command to prevent usage of /op from in-game.
-- Fixed a NullPointerException in PlayerInteract involving water potions and
-    potion blocking.
-- Fixed an issue with snowballs being blocked in regions.
-- Changed dragon eggs to be checked like it is a broken block in regions.
-- Moved developer's WGBukkit class to package com.sk89q.worldguard.bukkit.
-
-5.6.3:
-- Added helper WGBukkit class to get references to WorldGuard from other plugins.
-- Added physics.vine-like-rope-ladders to make ladders work like vines. As long as the
-    top ladder block is present, ladder blocks will hold even if they have no block
-    behind them, like a rope ladder.
-- Fixed NullPointerException in PlayerInteractEvent caused by potion blocking.
-- Fixed mobs.block-{item-frame,painting}-destroy not working.
-
-Thank you to def for testing the above fixes and features.
-
-5.6.2:
-- Fixed potion blocking not working well for splash potions.
-
-5.6.1:
-- Added a mycelium-spread region flag.
-- Added a dynamics.disable-mycelium-spread configuration setting.
-- Added new gameplay.block-potions option. For example:
-    gameplay:
-        block-potions: [invisibility, speed]
-- Fixed a bug in the entity explosion event handler that caused a NullPointerException.
-
-Thank you for gabizou for his contribution in this release.
-
-5.6:
-- Added official support for Minecraft 1.4. Support for 1.3.2 (and below) is still
-    provided in this release.
-- Added support for new and existing explosion types.
-- Added support for blocking withers with the following settings:
-    mobs:
-        block-wither-explosions: false
-        block-wither-block-damage: false
-        block-wither-skull-explosions: false
-        block-wither-skull-block-damage: true
-- Added support for blocking item frames (and their use) in protected regions.
-- Added item frame destruction region flags (if you wish to disable item frame 
-    destruction completely).
-- (Re-)added support for priority R-tree region indexes. This means quicker region lookup,
-    and better support for servers with thousands of regions.
-- Improved /region info output for -g group flags.
-- Allowed removing of -g group flags with /region flag.
-- Allowed /region flag to set group and value at once.
-- Deleting a region flag now also deletes group flag.
-- Fixed detection of attack by projectiles to be more accurate.
-- Fixed support for saving non-string flags in the MySQL region support.
-- Fixed spurious comma in "Flags:" /region info output.
-- Fixed players who are not in god mode not receiving damage in PVP areas from
-    enderpearls.
-- Players will now be told that they are in a no-PvP area if they are in one and
-    attempting to attack someone, or that the player they are attacking is in a
-    no-PvP area, if that is the case instead.
-- Fixed an issue where region.getId() was lowercase'd each pass of a for loop in
-    MySQLDatabase.updatePoly2dPoints().
-- Fixed mob damage from projectiles not being properly blocked in regions where
-    applicable.
-- Changed default region wand to leather (#334).
-
-Thank you to the following individuals for their contribution:
-thvortex, Rutr, Glitchfinder, and DarthAndroid.
-
-5.5.4:
-- Minecraft 1.3 support.
-- Fixed /stack dupe bugs.
-- Added regions.use-creature-spawn-event.
-- Update for Async chat issue.
-- Add use flag to cakes.
-- Report number of plugins loaded in report writer.
-- Updated fireblal item blocking.
-- Fixed permissions for /region reload.
-
-5.5.3:
-- Added game mode flag.
-- Added item drop pickup flag to regions.
-- Added support for fireball item blocking (385).
-- Added configuration option to allow creature spawns from plugins.
-- Added host key check.
-- Added a new line split feature to region greetings.
-- Prevented commands in the allow commands list from being blocked and
-    vice versa.
-
-5.5.2:
-- Added potion-splash flag to block splash potions
-- Add entity-painting-destroy which can be used to prevent entities from destroying
-    paintings (skeletons firing arrows)
-- Added send-chat and receive-chat flags
-- Fixed having regions in multiple worlds with the same name not working with MySQL
-- A cancellable event is now fired if WorldGuard disallows PvP. (for developers!)
-- Made /region setparent check worldguard.region.setparent.own/member.<parent> instead
-    of worldguard.region.setparent.own/member.<child>.
-- Allowed passing #<index> in place of a region ID, where <index> is the index as
-    displayed by /region list.
-- Fixed an error that occured when clearing a non-existant region's parent.
-- Added a -s flag to /region teleport, which sends you to the spawn point instead of the
-    teleport point of a region.
-- Added region/role-based permissions to /region teleport.
-- BREAKING CHANGE: Added a LocationFlag class and made the teleport and spawn flags
-    use it.
-- /region info -s now selects the region being queried.
-- Added /region teleport <id>.
-- Vector flags can now be set to the current location with the value "here" and to a
-    specific position with x,y,z.
-- Made /region info show the region you're in if you don't specify an id explicitly.
-- Prevent block ignition from lightning strikes if lightning is blocked in region. Fixes
-    #1175
-- Correctly check both WEPIF and superperms in WorldGurdPlugin.broadcastNotification()
-- Destroy fire blocks when fire-spread is disallowed
-- Added a construct flag that can be used to restrict block placing/destroying in zones
-    to certain roles.
-- Added FallingSand to list of intensive entities to be removed with /halt-activiy.
-- Replaced all usage of CreatureType by EntityType.
-- Updated to support Bukkit 1.2-R0.3 and newer
-- Made auto-god-mode disabled by default again.
-- Added sign protection check disable.
-- Cleaned up javadoc, deprecated duplicate methods, other cleanup
-- Added a RegionGroupFlag to evey region flag Using the /region flag command with -g,
-    the region group that the region flag applies to can be set.
-
-5.5.1:
-- Fixed attacking with arrows from non-PVP to PVP areas
-- Compatibility with Bukkit 1.1-R5
-- Removed broken suppress-tick-sync-warnings config option. See bukkit.yml's setings.warn-on-overload option instead.
-- Add region and 'can build' information to CommandBook's /whois
-
-Contributions thanks to: NolanSyKinsley
-
-5.5:
-- Removed WorldEdit.jar from the classpath to stop conflicts with Bukkit's plugin loader
-- Now using Bukkit's tagged logging
-- Updated to new event system
-- Flush player flag state cache on world change
-- Improved compatibility with versions of CommandBook without GodComponent and updated pom dep for 2.0
-- Added MySQL region storage method.
-- Made explosions display their animations even when the event was blocked.
-- Added fallback support for those who don't have a version of CommandBook with GodComponent
-- Added LIGHTNING flag to DefaultFlag's flagsList Fixes #1026
-- Removed /god, /heal, /locate, and /stack from WorldGuard to CommandBook. CommandBook is now checked to see whether a player is godded.
-- Removed remaining usages of org.bukkit.util.config.Configuration
-- Removed some unused configuration options
-- Added permission worldguard.region.wand to the region wand
-- Fixed ProtectedRegion.compareTo.
-- Fixed FlatRegionManager.getApplicableRegions to return parent regions as well.
-- Added exp-drops flag to disable experience drops per-region.
-- Fixed some warnings.
-- Updated dependency version for WorldGuard from 5.0 to 5.1-SNAPSHOT.
-- Added support for fireballs shot by players being blocked by the PVP flag.
-- Now using dynamic command registration
-- Split off ender dragon block damage from creeper block damage.
-
-Contributions thanks to: narthollis, DarkArc, Wolvereness, and skeight
-
-5.4:
-- Fixed configuration generation on Windows
-- Fixed intersection calculation for regions
-- Fixed timer and feeding delay for food flags
-- Fixed region managers not being created properly (This caused errors related to CREATURE_SPAWN)
-- Added support for Minecraft 1.0.1 blocks
-- Added support for enchantments and tool damage (worldguard.stack.damaged is the node) with /stack
-- Made being in the wg-invincible group respect the configuration's auto-invincible setting
-- Added per-group region claim limit maximum
-- Added worldguard.region.addowner.unclaimed.* permission for non-economy region 'buying'
-- Checking allowed/blocked commands now occurs earlier to override more plugins
-- Made PVP flag check whether either player is in a pvp deny region for blocking
-
-Contributions thanks to: epuidokas, wizjany, Turtle9598, and DerFlash
-
-5.3:
-- Added new config options and flags to better handle explosions of all types
-- Added config options and flags for snow, ice, mushroom spread, grass spread,
-    and leaf decay
-- Added min and max health flags to clamp the values for the existing healing
-    flags
-- Added hunger flags similar to the existing healing flags
-- Added an option to disable the use of the move event. This can boost
-    performance on large servers but will disable the greeting/farewell
-    and entry/exit flags
-- Added flag to prevent pistons (including those that are outside the
-    region, but would affect blocks inside the region)
-- Added a /wg flushstates [player] command to free players stuck in a
-    region that was exit-deny but no longer exists or the flag was removed
-- Added a config option to disable xp orb dropping
-- Added config option to disable redstone wire obsidian generators
-- Added a vehicle-destroy flag
-- Added enderman protection config and flag
-- Allowed and blocked command flags will now fall back to the global region
-- The worldguard.region.flag.own/member permissions are now
-    worldguard.region.flag.regions.own/member! Please change your permissions
-    accordingly.
-- Made //stack respect max stack sizes unless the player has the
-    worldguard.stack.illegitimate permission
-- Setting invincibility flag to deny will override god mode unless the player
-    has worldguard.god.override-regions
-- The sleep flag will now prevent beds in the nether from
-    exploding if set to deny
-- Existing regions can no longer be accidentally overwritten.
-    Use /region redefine to move an existing region.
-- The info command will now sort players alphabetically
-- Priming TNT by punching it with flint and steal should throw a blacklist
-    event (consistent with old Minecraft versions)
-- The /stoplag command will now remove xp orbs
-- Permissions system will use per-world permissions if the provider supports it
-- Players in vehicles are now subject to entry/exit and greeting/farewell flags
-- Fixed interact blacklist event not logging correctly
-- Fixed heal flag taking effect half a block northeast of the region
-- Fixed a infinite sign dropping bug
-- Fixed players being able to douse fire by punching it in regions they
-    couldn't build it
-- Fixed players being able to eat protected cake
-- Fence gate usage can be blocked with the use flag
-- Fixed chests being unprotected when they should be in 1.8
-- Fixed weather config settings not applying when a world was loaded
-- Fixed explosion handling in certain cases
-- Fixed arrows working in non-pvp zones
-- Fixed buckets working on the border of protected regions in certain cases
-Contributions thanks to:
-wizjany, zml2008, imjake9, Droolio, epuidokas,
-EduardBaer, TomyLobo, and halvors
-
-5.2.2:
-- Changed configuration saving so empty lists will be added to
-    the configuration files.
-
-5.2.1:
-- Add region bounds to /region info
-- Added the ability to add owners/members to the global region for
-    handling guest groups. Now if there's owners or members on the global
-    region, then those  that are not on the list cannot build.
-- Fixed some flag algorithm issues.
-- API: Fixed DefaultDomain.size() not counting players.
-- API: Undeprecated ApplicableRegionSet.allows(StateFlag).
-
-5.2:
-- Gave the ability to use color colors and macros in greeting
-    and farewell messages.
-- Added disable-ice-melting, disable-snow-formation, disable-mushroom-spread,
-    disable-snow-melting, disable-ice-formation.
-- Added paintings to blacklist support.
-- Added default.disable-health-regain.
-- Added auto-invincible-permission setting, which lets you use the permission
-    'worldguard.auto-invincible' to become invincible on join automatically.
-- Flames won't appear if you are /god'ed now. 
-- Added blocked-cmds region flag to block commands.
-- Added allowed-cmds region flag to whitelist commands.
-- Added entry region flag to block entry. Use entry-group to determine who
-    this affects.
-- Added exit region flag to block exit. Use exit-group to determine who
-    this affects.
-- Made negative healing possible via the healing flag.
-- Changed the configuration header messages to be more helpful to new users.
-- Added a warning about modifying region files by hand.
-- Improved the API for plugin developers.
-
-5.1:
-- A lot of changes.
-
-4.0-alpha1:
-- This release is only to fix WorldGuard for Bukkit. Ignore the 4.0
-    label. Just move along. Nothing to see.
-
-3.2.2:
-- Changed disable-water-damage to disable-drowning-damage.
-- Fixed suffocation disable option.
-- Fixed fire spread blocking.
-- stopfire and allowfire now work in server console, just like in hMod.
-
-3.2.1:
-- Updated for recent Bukkit ItemStack change.
-
-3.2:
-- Added regions.default.pvp to control default PvP setting.
-- Updated WorldGuard for the newer builds of Bukkit.
-- Fixed creeper explosion blocking.
-- Added redstone support to sponges, removed classic water.
-- Fixed item durability disable for hoes.
-
-
-3.1.2:
-- Increased the priority of WorldGuard's event handling.
-
-3.1.1:
-- Fixed creeper and chest flag conflicting.
-
-3.1:
-- Added ability to disable chest protection. New configuration setting
-    (regions.build.chest-access) and new chest flag.
-- Possibly fixed projectile blocking in no-PvP zones.
-- Added /regionmembership permission that lets people only change
-    the owners and members of regions they own.
-
-3.0b2:
-- Fixed issue where built-in permissions were not (re)loaded.
-- Fixed /god not working for others.
-
-3.0b1:
-- Added parent-child relationships to regions.
-- Added global build flag.
-- Improved flag support.
-- Fixed no-PvP zone messages being sent to the wrong person.
-- Fixed commands so that they work in a recent version of Bukkit.
-- Fixed NullPointerException in explode hook.
-
-2.3.1:
-- Fixed various cast exceptions with the blacklist loggers.
-- Added checks for unchecked exceptions when resolving permissions.
-- Fixed the item durability disable setting changing the damage value on
-    an empty hand.
-
-2.3:
-- /god now works very well.
-- Item (TNT, flint and steel, etc.) blocking should now work.
-- The TNT blocking configuration variable should now work.
-- Re-added /heal (not sure where that went), added /slay.
-- Implemented contact damage disable toggle.
-- Made all player damage disabling configuration parameters work.
-- Fixed teleport-on-suffocation setting.
-- Added /locate <name>, /locate <x> <y> <z>, and /locate that lets you
-    program/change your compass bearing to point to a player's position
-    (not yet live), a position, or back to spawn.
-- Fixed CSVDatabase spitting an error if the owners list was empty.
-
-2.2:
-- Now supports GroupUsers.
-- Added support for blocking creeper explosions.
-- Fixed a bug where a player's groups were not being loaded correctly,
-    causing the blacklist group ignore option to not work.
-
-2.1.1:
-- Fixed fire spread disable preventing flint and steel too.
-- Fixed NullPointerException related to the player item event.
-- Made setup simpler.
-
-2.1:
-- Improved Bukkit support.
-
-2.0beta3:
-- Fixed NullPointerException inside the ignite hook.
-
-2.0beta2:
-- Fixed a NullPointerException in the damage hook.
-
-2.0beta1:
-- Added area protection. Use /region or /rg to define regions.
-
-1.8.1
-- Fixed NullPointerException.
-
-1.8
-- Updated for Minecraft beta.
-- Blacklist hooks have CHANGED. The new hooks are work better. on-create has
-    been replaced with on-place (for block placement) and on-use
-    (for item usage, light buckets and lighters). The old on-use is now
-    on-right-click although it currently does nothing.
-- Added coordinates to blacklist file logger.
-- Added suffocation damage prevention.
-
-1.7.1
-- Updated for v0.2.8.
-
-1.7
-- Updated for v0.2.6_02 and hMod b129.
-- Added option to prevent water from damaging particular blocks
-    (Redstone wire, Minecart tracks, etc.). See disable-water-damage-blocks.
-- /reload WorldGuard should now reload WorldGuard's configuration.
-- Added wg-invincible and wg-amphibious groups that let you give certain
-    players invincibility or underwater breathing.
-- Added the ability to disable fall, water, lava, and/or fire damage.
-- Water/lava bucket blocking should now be more reliable.
-- Added /stack (alias /;) commands to stack items in your inventory into
-    piles up to 64 items in size. Even unstackable items like signs can be
-    stacked.
-- /god mode should now let you gain health.
-- /god mode should now work more reliably.
-- Caught an error message for when the configuration file does not exist.
-
-1.6
-- Added spawn protection that prevents damage when a player spawns.
-- Added login protection that prevents damage when a player joins.
-- Added /god. /god can be used on others, provided that the /godother
-    permission is set for the command's user.
-
-1.5.1
-- Removed the 'java.lang.NoSuchMethodError: Item.setDamage(I)V' error
-    generated.
-
-1.5
-- Removed the block lag fix.
-- WorldGuard now conditionally loads features so you can use any up-to-date
-    build of hMod and the unsupported features won't break the entire
-    plugin. When WG loads, check the server console for a report of
-    features that are not supported by your version of hMod.
-- Changed some configuration defaults:
-    disable-lava-fire=true
-    simulate-sponge=true
-    item-durability=false
-
-1.4.1
-- Fixed issue with the block lag fix dropping item stacks of 0 quantity.
-
-1.4
-- New on-acquire hook. This does both a total inventory check on inventory
-    change and item pick up denial. The item pick up denial is largely
-    thanks to Dinnerbone for fulfilling my request to add a particular hook.
-- Item durability can now be toggled with item-durability. Thanks to
-    Dinnerbone for figuring this out while filfilling my request. The
-    default setting is to fix item durability.
-- New no-physics-gravel and no-physics-sand options allow you to
-    prevent gravel and sand from falling.
-- New allow-portal-anywhere option allows you to create portal blocks
-    anywhere.
-    
-1.3
-- UPGRADE WARNING: If you are using database logging, you must add a
-    NULL 'comment' VARCHAR field to the table. The line of SQL that you
-    can run for MySQL can be found in blacklist_table.sql.
-- Improved plugin compatibility with the block lag fix. For maximum
-    compatibility, you must now list WorldGuard as the first plugin in
-    server.properties and you cannot reload or enable the plugin
-    while the server is up. This is for bad plugins that unnecessarily
-    use the "critical" priority for its hooks like the LWC. Most plugins
-    don't do that though, so this won't apply for most people.
-- Fixed signs being blank if they were denied via the blacklist.
-- Added on-break event to the blacklist.
-- Added comments and messages. Comments are only for your own use and they
-    are printed with the log and notify actions of the blacklist. The
-    message replaces the message that is shown the user and it is optional.
-- The blacklist notification messages are now more compact and are
-    light grey instead of light purple.
-- The notify, log, and tell actions will now trigger every time for the
-    on-break, on-create, on-drop events rather than wait 3 seconds between
-    events for the same item or block for a player.
-
-1.2
-- /stopfire and /allowfire disable and enable fire spreading globally.
-- Block lag fix slightly improved in accuracy for item drops.
-- Sponge updated to remove water when the sponge block is set. Sponge radius
-    can now be controlled using the 'sponge-radius' parameter and the
-    default is now set to simulate Classic.
-- Updated for a newer build of "b126," meaning that lava spread control
-    now works well!
-- A new summary of the status of some core protections is now printed
-    on start. Disable this with 'summary-on-start'.
-- Blacklist system has been overhauled. Check README.txt for changed
-    configuration settings!
-- The blacklist's method of preventing notification repeats is now better,
-    instead waiting 3 seconds before notifying again (before it didn't
-    notify again at all unless the user started using another blocked
-    action).
-- To give users the ability to receive notifications, the command to give
-    permission to has been changed to /worldguardnotify, although the
-    old one (that was never mentioned anywhere) still works.
-- Water and lava buckets are now psuedo-blocked using an unreliable
-    method that risks the stability of your server (no other plugin
-    does it better though). Use it as your own risk.
-- Added on item drop and on item use (i.e. chest) events.
-- Chests, signs, and furnaces can now be blocked better with the
-    blacklist system.
-- The event names in the blacklist configuration have changed but the old
-    event names should still work. The new names should make "more sense."
-- A new "ban" action has been added to the blacklist.
-- Action messages have been improved, now longer saying "destroyed"
-    for everything.
-- Logging to file has been completely changed, allowing you to use
-    the date and time and the player's username in the log filename. It
-    no longer rotates log files based on size, however.
-- Logging to database is now supported.
-- Tools can now be destroyed on drop to alleviate the durability cheat.
-    You can do this with either with the blacklist or with the
-    'item-drop-blacklist' configuration option. The configuration option
-    prints more friendly messages than the 'tell' action of blacklists.
-
-1.1.2
-- Block lag fix: Snow and glass should no longer drop items.
-- Block lag fix: Block object now reset after hook call.
-
-1.1.1
-- Fixed redstone wire dropping wood blocks with the block lag fix.
-- The block lag fix now consults other plugins so that ALL protection
-    mechanisms and plugins should work.
-
-1.1
-- Added block lag fix.
-
-1.0
-- Initial release.

COMPILING.md

@@ -0,0 +1,39 @@
+Compiling
+=========
+
+You can compile WorldGuard as long as you have some version of Java greater than or equal to 21 installed. 
+Gradle will download JDK 21 specifically if needed, but it needs some version of Java to bootstrap from.
+
+The build process uses Gradle, which you do *not* need to download. WorldGuard is a multi-module project with three modules:
+
+* `worldguard-core` contains the WorldGuard API
+* `worldguard-bukkit` is the Bukkit plugin
+* `worldguard-libs` contains library relocations
+
+## To compile...
+
+### On Windows
+
+1. **Shift** + **right click** the folder with WorldGuard's files and click "Open PowerShell window here".
+2. `gradlew build`
+
+### On Linux, BSD, or Mac OS X
+
+1. In your terminal, navigate to the folder with WorldGuard's files (`cd /folder/of/worldguard/files`)
+2. `./gradlew build`
+
+## Then you will find...
+
+You will find:
+
+* The core WorldGuard API in **worldguard-core/build/libs**
+* WorldGuard for Bukkit in **worldguard-bukkit/build/libs**
+
+If you want to use WorldGuard, use the `-dist` version.
+
+(The -dist version includes WorldGuard + necessary libraries.)
+
+## Other commands
+
+* `gradlew idea` will generate an [IntelliJ IDEA](http://www.jetbrains.com/idea/) module for each folder.
+* `gradlew eclipse` will generate an [Eclipse](https://www.eclipse.org/downloads/) project for each folder.

CONTRIBUTING.md

@@ -1,16 +1,13 @@
-Contributing
-============
+# Contributing
 
 Thank you for your interest in contributing to WorldGuard! We appreciate your 
 effort, but to make sure that the inclusion of your patch is a smooth process, we
 ask that you make note of the following guidelines.
 
-* **Follow the [Oracle coding conventions](http://www.oracle.com/technetwork/java/codeconv-138413.html).**
+* **Follow the [Oracle coding conventions](https://www.oracle.com/technetwork/java/javase/documentation/codeconvtoc-136057.html).**
   We can't stress this enough; if your code has notable issues, it may delay
   the process significantly.
-* **Target Java 6 for source and compilation.** Make sure to mark methods with
-  ` @Override` that override methods of parent classes, or that implement
-  methods of interfaces (Java 6+).
+* **Target Java 16 for source and compilation.**
 * **Use only spaces for indentation.** Our indents are 4-spaces long, and tabs
   are unacceptable.
 * **Wrap code to a 89 column limit.** We do this to make side by side diffs

HEADER.txt

@@ -0,0 +1,16 @@
+WorldGuard, a suite of tools for Minecraft
+Copyright (C) sk89q <http://www.sk89q.com>
+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 <http://www.gnu.org/licenses/>.

LICENSE.txt

@@ -1,203 +1,201 @@
-----------------------------------------------------------------------------
-WorldGuard License
-----------------------------------------------------------------------------
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-----------------------------------------------------------------------------
-PRTree License
-----------------------------------------------------------------------------
-
-Copyright (c) 2008-2010 Robert Olofsson.
-All rights reserved. 
-
-Redistribution and use in source and binary forms, with or without 
-modification, are permitted provided that the following conditions 
-are met: 
-
-1. Redistributions of source code must retain the above copyright 
-   notice, this list of conditions and the following disclaimer. 
-
-2. Redistributions in binary form must reproduce the above copyright 
-   notice, this list of conditions and the following disclaimer in the 
-   documentation and/or other materials provided with the distribution. 
-
-3. Neither the name of the authors nor the names of its contributors 
-   may be used to endorse or promote products derived from this software 
-   without specific prior written permission. 
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND 
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
-ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE 
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
-OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
-OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
+
+----------------------------------------------------------------------------
+
+This work includes Robert Olofsson's Priority R-Tree implementation, for which
+its license is reproduced below.
+
+Copyright (c) 2008-2010 Robert Olofsson.
+All rights reserved. 
+
+Redistribution and use in source and binary forms, with or without 
+modification, are permitted provided that the following conditions 
+are met: 
+
+1. Redistributions of source code must retain the above copyright 
+   notice, this list of conditions and the following disclaimer. 
+
+2. Redistributions in binary form must reproduce the above copyright 
+   notice, this list of conditions and the following disclaimer in the 
+   documentation and/or other materials provided with the distribution. 
+
+3. Neither the name of the authors nor the names of its contributors 
+   may be used to endorse or promote products derived from this software 
+   without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND 
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE 
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL 
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
 SUCH DAMAGE.

README.html

@@ -1,232 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<title>${project.name} ${version}</title>
-<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Ropa+Sans" rel="stylesheet" type="text/css">
-<style>
-body {
-    margin: 0;
-    padding: 3em 1em;
-    background: #efefef;
-    color: #333;
-    line-height: 1.5;
-}
-#wrapper {
-    width: 600px;
-    margin: auto;
-}
-body, th, td, input {
-    font: 14px 'Source Sans Pro', Arial, sans-serifsans-serif;
-}
-.section {
-	background: #fff;
-	position: relative;
-	padding: 2em 2.4em;
-	margin: 3em auto 4em auto;
-    width: 80%;
-    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-}
-.section:before, .section:after {
-	content: "";
-	position: absolute;
-	z-index: -2;
-}
-.section {
-    -moz-border-radius: 4px;
-    border-radius: 4px;
-}
-.section:before, .section:after {
-	bottom: 15px;
-	left: 10px;
-	width: 50%;
-	height: 20%;
-	max-width: 300px;
-	max-height: 100px;
-    -webkit-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    -moz-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
-    -webkit-transform: rotate(-1deg);
-    -moz-transform: rotate(-1deg);
-    -ms-transform: rotate(-1deg);
-    -o-transform: rotate(-1deg);
-    transform: rotate(-1deg);
-}
-.section:after {
-    right: 10px;
-    left: auto;
-    -webkit-transform: rotate(1deg);
-    -moz-transform: rotate(1deg);
-    -ms-transform: rotate(1deg);
-    -o-transform: rotate(1deg);
-    transform: rotate(1deg);
-}
-a:link, a:visited {
-    color: #0004b2;   
-    text-decoration: none;
-}
-a:hover {
-    color: #ac0000;
-    text-decoration: none;
-    border-bottom: 1px solid #999;
-}
-h1 {
-    font: 2.7em 'Ropa Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif;
-    color: #000;
-    margin: 0 0;
-    padding: 0 0 0.2em 0;
-    font-weight: normal;
-    text-align: center;
-    text-shadow: 2px 2px #FFF;
-}
-h2 {
-    font-size: 1.3em;
-    color: #FFF;
-    margin: -2.5em 0 0.8em 0;
-    float: left;
-    background: #0049FF;
-    padding: 0.4em 0.8em;
-    border-radius: 0.2em;
-    font-weight: normal;
-    text-align: center; 
-}
-h3 {
-    text-transform: uppercase;
-    font-weight: bold;
-}
-h2 + * {
-    clear: both;
-}
-@media (max-width: 650px) {
-    #wrapper {
-        width: 100%;
-    }
-}
-</style>
-</head>
-<body>
-
-<div id="wrapper">
-    <h1>${project.name} ${version}</h1>
-    <div class="section">
-        <h2>Getting Started</h2>
-        <p>
-            Thanks for choosing ${project.name}! When you first install ${project.name},
-            nothing will be enabled, so you will need to switch on the features
-            that you need to use, whenever it is convenient for you.
-        </p>
-        <ul>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Installation">How do I install ${project.name}?</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Upgrading">How do I update ${project.name}?</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}#Usage">How do I use ${project.name}?</a></li>
-        </ul>
-        <p>
-            Need help?
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
-        </p>
-    </div>
-    <div class="section">
-        <h2>Common Issues</h2>
-        
-        <h3>What are the other files that come with the download?</h3>
-        <p>
-            Inside the folder "contrib" of the download are the following files:
-        </p>
-        <ul>
-            <li>blacklist_table.sql is for using a database with the 
-              <a href="http://wiki.sk89q.com/wiki/${project.name}/Blacklist">blacklist feature</a>.</li>
-            <li>region_storage.sql is for using a database with the
-                <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions">region protection feature</a>.</li>
-            <li>region_storage_update_20110325.sql is for updating your region protection
-                database (if you're using it) if your database was made before March 25, 2011.</li>
-        </ul>
-        
-        <h3>${project.name} doesn't seem to work.</h3>
-        <p>
-            Two common mistakes include forgetting to install WorldEdit
-            (${project.name} needs it), or making
-            a syntax error in one of ${project.name}'s configuration files (this is very
-            fatal unfortunately, and can be caused by a single character typed in the wrong place). Try 
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">asking in IRC</a>
-            to see whether anyone can help you.
-        </p>
-        
-        <h3>How do I protect my spawn, or another area?</h3>
-        <p>
-            Read the <a href="http://wiki.sk89q.com/wiki/${project.name}/Regions/Tutorial">area protection tutorial</a>
-            on our wiki. For more detailed information, be sure to read about
-            <a href="http://wiki.sk89q.com/wiki/WorldGuard/Regions">region protection on the wiki</a>. Note
-            that if you can't build in spawn, don't forget that Minecraft comes with its own
-            limited spawn protection that you have to disable (see below).
-        </p>
-        
-        <h3>I or others don't have permission to build.</h3>
-        <p>
-            Unless you copied configuration files from an older installation of 
-            ${project.name}, your problem is either caused by another plugin, or by not
-            disabling the built-in spawn protection of the Minecraft server.
-        </p>
-        
-        <h3>No one can build in a region I made!</h3>
-        <p>
-            Make sure that:
-        </p>
-        <ul>
-            <li>You didn't change the 'build' flag, because protection is on by default
-                when a new region is made. Setting the build flag to 'deny' means that
-                no one can modify the things inside the region.</li>
-            <li>That you added the player as an owner or member of the region. If you are using
-                a group (g:groupName), you may have to give the group the permission of
-                group.groupName for ${project.name} to recognize it.</li>
-            <li>That you disabled spawn protection. The Minecraft server has an automatic
-                spawn protection feature where only 'ops' can build in a definable
-                radius around spawn (by default, it is 16 blocks). If you are on Minecraft
-                1.4 or newer, edit "spawn-protection" in server.properties; otherwise, modify bukkit.yml
-                and change the spawn-radius setting.</li>
-            <li>That it's not another plugin causing you trouble. The error messages of ${project.name} are of
-                a dark red shade. If the color of the "no permission" message is not
-                that color, it is not ${project.name}.</li>
-        </ul>
-        
-        <h3>Everyone can build in a region I made!</h3>
-        <p>
-            Make sure that:
-        </p>
-        <ul>
-            <li>You didn't change the 'build' flag, because protection is on by default
-                when a new region is made. Setting the build flag to 'allow' means that
-                anyone can modify the things inside the region.</li>
-            <li>That it's not caused by another plugin. If players are getting a dark red
-                permission denied message, but they can still build, another plugin
-                is likely causing the conflict.</li>
-        </ul>
-        
-        <h3>Where do I report bugs or suggest ideas?</h3>
-        <p>
-            Make sure you are using the latest version of ${project.name}, try asking in
-            IRC first (see "Need help?" above) if it's a problem, and if you think you've
-            found a bug or have a great suggestion to provide, please
-            report it to <a href="http://youtrack.sk89q.com/issues/WORLDGUARD">our issue tracker</a>.
-        </p>
-        
-        <p>
-            Still need help?
-            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
-        </p>
-    </div>
-    <div class="section">
-        <h2>Contributing</h2>
-        <p>
-            Did you know that ${project.name} is open source? That means that you can
-            read the code and learn from it, as well as modify it and submit back
-            changes to help the community!
-        </p>
-        <ul>
-            <li><a href="https://github.com/sk89q/worldguard">View the source code</a></li>
-            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Development">More information</a></li>
-        </ul>
-    </div>
-</div>
-</body>
-</html>

README.md

@@ -1,38 +1,47 @@
-![WorldGuard](http://static.sk89q.com/readme/worldguard.png)
-==========
-
-WorldGuard is a toolbox of various functions, useful for multiplayer servers, that lets you:
-
-* Protect your server from a number of problems.
-* Block fire spread, lava spread, endermen, and more.
-* Flag areas as "no PVP" or "no TNT."
-* Assign ownership to areas so only selected individuals can build.
-* Use a number of useful commands.
-
-WorldGuard is open source and is available under the GNU General Public License v3.
-
-Compiling
----------
-
-The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldGuard/Development#Compiling).
-
-Dependencies are automatically handled by Maven.
-
-Contributing
-------------
-
-We happily accept contributions, especially through pull requests on GitHub. Submissions 
-must be licensed under the GNU General Public License v3.
-
-Please read CONTRIBUTING.md for important guidelines to follow.
-
-We recommend following our [mailing list](https://groups.google.com/d/forum/sk-dev-discuss), especially if you have some big ideas that you want to implement.
-
-Links
------
-
-* [Mailing list](https://groups.google.com/d/forum/sk-dev-discuss)
-* [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
-* [Issue tracker](http://youtrack.sk89q.com/issues/WORLDGUARD)
-* [Continuous integration](http://builds.enginehub.org) [![Build Status](https://secure.travis-ci.org/sk89q/worldguard.png)](http://travis-ci.org/sk89q/worldguard)
-* [End-user documentation](http://wiki.sk89q.com/wiki/WorldGuard)
+<h1>
+    <img src="worldguard-logo.svg" alt="WorldGuard" width="400" /> 
+</h1>
+
+WorldGuard lets you and players guard areas of land against griefers and undesirables, as well as tweak and disable various gameplay features of Minecraft.
+
+* Block creeper and wither block damage, falling damage, etc.
+* Disable fire spread, lava fire spread, ice formation, Endermen picking up blocks, etc.
+* Blacklist certain items and blocks so they can't be used
+* Warn moderators when certain items and blocks are used
+* Protect areas of your world so only certain people can build in them
+* Set areas where PVP, TNT, mob damage, and other features are disabled
+* Protect your server from various 'exploits' like magical obsidian creation machines
+* Disable, or enable, various Minecraft features, like sponges from classic
+* Add useful commands like an immediate "STOP ALL FIRE SPREAD" command
+* Enable only features you want! Everything is off by default
+
+WorldGuard is open source and is available under the GNU Lesser
+General Public License v3.
+
+A Bukkit server implementation (such as [Paper](https://papermc.io)) and the [WorldEdit plugin](https://dev.bukkit.org/projects/worldedit) are required to use WorldGuard. You can get a release copy of WorldGuard from the [BukkitDev site](https://dev.bukkit.org/projects/worldguard).
+
+Compiling
+---------
+
+The project is written for Java 17 and our build process makes use of
+[Gradle](http://gradle.org).
+
+Dependencies are automatically handled by Gradle.
+
+Contributing
+------------
+
+We happily accept contributions, especially through pull requests on GitHub.
+
+Please read CONTRIBUTING.md for important guidelines to follow.
+
+Submissions must be licensed under the GNU Lesser General Public License v3.
+
+Links
+-----
+
+* [Homepage](https://enginehub.org/worldguard)
+* [Discord](https://discord.gg/enginehub)
+* [Issue tracker](https://github.com/EngineHub/WorldGuard/issues)
+* [Continuous integration](https://builds.enginehub.org) [![Build Status](https://ci.enginehub.org/app/rest/builds/buildType:bt11,branch:master/statusIcon.svg)](http://ci.enginehub.org/viewType.html?buildTypeId=bt11&guest=1)
+* [End-user documentation](https://worldguard.enginehub.org/en/latest/)

build-logic/build.gradle.kts

@@ -0,0 +1,29 @@
+plugins {
+    `kotlin-dsl`
+}
+
+repositories {
+    gradlePluginPortal()
+}
+
+dependencies {
+    implementation(gradleApi())
+    implementation(libs.licenser)
+    implementation(libs.grgit)
+    implementation(libs.shadow)
+    implementation(libs.jfrog.buildinfo)
+    implementation(libs.gson)
+
+    constraints {
+        val asmVersion = "[${libs.versions.minimumAsm.get()},)"
+        implementation("org.ow2.asm:asm:$asmVersion") {
+            because("Need Java 21 support in shadow")
+        }
+        implementation("org.ow2.asm:asm-commons:$asmVersion") {
+            because("Need Java 21 support in shadow")
+        }
+        implementation("org.vafer:jdependency:[${libs.versions.minimumJdependency.get()},)") {
+            because("Need Java 21 support in shadow")
+        }
+    }
+}

build-logic/settings.gradle.kts

@@ -0,0 +1,9 @@
+dependencyResolutionManagement {
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
+
+rootProject.name = "build-logic"

build-logic/src/main/kotlin/buildlogic.artifactory-root.gradle.kts

@@ -0,0 +1,32 @@
+import org.jfrog.gradle.plugin.artifactory.dsl.ArtifactoryPluginConvention
+import org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask
+
+plugins {
+    id("com.jfrog.artifactory")
+}
+
+val ARTIFACTORY_CONTEXT_URL = "artifactory_contextUrl"
+val ARTIFACTORY_USER = "artifactory_user"
+val ARTIFACTORY_PASSWORD = "artifactory_password"
+
+if (!project.hasProperty(ARTIFACTORY_CONTEXT_URL)) ext[ARTIFACTORY_CONTEXT_URL] = "http://localhost"
+if (!project.hasProperty(ARTIFACTORY_USER)) ext[ARTIFACTORY_USER] = "guest"
+if (!project.hasProperty(ARTIFACTORY_PASSWORD)) ext[ARTIFACTORY_PASSWORD] = ""
+
+configure<ArtifactoryPluginConvention> {
+    setContextUrl("${project.property(ARTIFACTORY_CONTEXT_URL)}")
+    clientConfig.publisher.run {
+        repoKey = when {
+            "${project.version}".contains("SNAPSHOT") -> "libs-snapshot-local"
+            else -> "libs-release-local"
+        }
+        username = "${project.property(ARTIFACTORY_USER)}"
+        password = "${project.property(ARTIFACTORY_PASSWORD)}"
+        isMaven = true
+        isIvy = false
+    }
+}
+
+tasks.named<ArtifactoryTask>("artifactoryPublish") {
+    isSkip = true
+}

build-logic/src/main/kotlin/buildlogic.artifactory-sub.gradle.kts

@@ -0,0 +1,10 @@
+plugins {
+    id("com.jfrog.artifactory")
+}
+
+// Artifactory eagerly evaluates publications, so this must run after all changes to artifacts are done
+afterEvaluate {
+    tasks.named<org.jfrog.gradle.plugin.artifactory.task.ArtifactoryTask>("artifactoryPublish") {
+        publications("maven")
+    }
+}

build-logic/src/main/kotlin/buildlogic.common-java.gradle.kts

@@ -0,0 +1,65 @@
+import buildlogic.getLibrary
+import buildlogic.stringyLibs
+
+plugins {
+    id("eclipse")
+    id("idea")
+    id("checkstyle")
+    id("buildlogic.common")
+}
+
+tasks
+    .withType<JavaCompile>()
+    .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+    .configureEach {
+        val disabledLint = listOf(
+            "processing", "path", "fallthrough", "serial", "overloads",
+        )
+        options.release.set(21)
+        options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })
+        options.isDeprecation = true
+        options.encoding = "UTF-8"
+        options.compilerArgs.add("-parameters")
+        //options.compilerArgs.add("-Werror")
+    }
+
+configure<CheckstyleExtension> {
+    configFile = rootProject.file("config/checkstyle/checkstyle.xml")
+    toolVersion = "10.16.0"
+}
+
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform()
+}
+
+dependencies {
+    "compileOnly"(stringyLibs.getLibrary("jsr305"))
+    "testImplementation"(platform(stringyLibs.getLibrary("junit-bom")))
+    "testImplementation"(stringyLibs.getLibrary("junit-jupiter-api"))
+    "testImplementation"(stringyLibs.getLibrary("junit-jupiter-params"))
+    "testRuntimeOnly"(stringyLibs.getLibrary("junit-jupiter-engine"))
+}
+
+// Java 8 turns on doclint which we fail
+tasks.withType<Javadoc>().configureEach {
+    options.encoding = "UTF-8"
+    (options as StandardJavadocDocletOptions).apply {
+        //addBooleanOption("Werror", true)
+        addBooleanOption("Xdoclint:all", true)
+        addBooleanOption("Xdoclint:-missing", true)
+        tags(
+            "apiNote:a:API Note:",
+            "implSpec:a:Implementation Requirements:",
+            "implNote:a:Implementation Note:"
+        )
+    }
+}
+
+configure<JavaPluginExtension> {
+    withJavadocJar()
+    withSourcesJar()
+}
+
+tasks.named("check").configure {
+    dependsOn("checkstyleMain", "checkstyleTest")
+}

build-logic/src/main/kotlin/buildlogic.common.gradle.kts

@@ -0,0 +1,69 @@
+import buildlogic.getLibrary
+import buildlogic.stringyLibs
+import org.gradle.plugins.ide.idea.model.IdeaModel
+
+plugins {
+    id("org.cadixdev.licenser")
+}
+
+group = rootProject.group
+version = rootProject.version
+
+repositories {
+    mavenCentral()
+    maven {
+        name = "EngineHub"
+        url = uri("https://maven.enginehub.org/repo/")
+    }
+}
+
+configurations.all {
+    resolutionStrategy {
+        cacheChangingModulesFor(1, TimeUnit.DAYS)
+    }
+}
+
+plugins.withId("java") {
+    the<JavaPluginExtension>().toolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
+dependencies {
+    for (conf in listOf("implementation", "api")) {
+        if (!configurations.names.contains(conf)) {
+            continue
+        }
+        add(conf, platform(stringyLibs.getLibrary("log4j-bom")).map {
+            val dep = create(it)
+            dep.because("Mojang provides Log4j")
+            dep
+        })
+        constraints {
+            add(conf, stringyLibs.getLibrary("guava")) {
+                because("Mojang provides Guava")
+            }
+            add(conf, stringyLibs.getLibrary("gson")) {
+                because("Mojang provides Gson")
+            }
+            add(conf, stringyLibs.getLibrary("fastutil")) {
+                because("Mojang provides FastUtil")
+            }
+        }
+    }
+}
+
+license {
+    header(rootProject.file("HEADER.txt"))
+    include("**/*.java")
+    include("**/*.kt")
+}
+
+plugins.withId("idea") {
+    configure<IdeaModel> {
+        module {
+            isDownloadSources = true
+            isDownloadJavadoc = true
+        }
+    }
+}

build-logic/src/main/kotlin/buildlogic.core-and-platform.gradle.kts

@@ -0,0 +1,23 @@
+plugins {
+    id("java")
+    id("maven-publish")
+    id("buildlogic.common-java")
+    id("buildlogic.artifactory-sub")
+}
+
+ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
+
+publishing {
+    publications {
+        register<MavenPublication>("maven") {
+            versionMapping {
+                usage("java-api") {
+                    fromResolutionOf("runtimeClasspath")
+                }
+                usage("java-runtime") {
+                    fromResolutionResult()
+                }
+            }
+        }
+    }
+}

build-logic/src/main/kotlin/buildlogic.libs.gradle.kts

@@ -0,0 +1,179 @@
+plugins {
+    id("java-base")
+    id("maven-publish")
+    id("com.github.johnrengelman.shadow")
+    id("com.jfrog.artifactory")
+    id("buildlogic.common")
+    id("buildlogic.artifactory-sub")
+}
+
+// A horrible hack because `softwareComponentFactory` has to be gotten via plugin
+// gradle why
+internal open class LibsConfigPluginHack @Inject constructor(
+    private val softwareComponentFactory: SoftwareComponentFactory
+) : Plugin<Project> {
+    override fun apply(project: Project) {
+        val libsComponents = softwareComponentFactory.adhoc("libs")
+        project.components.add(libsComponents)
+    }
+}
+
+configurations {
+    create("shade")
+}
+
+group = "${rootProject.group}.worldguard-libs"
+
+val relocations = mapOf(
+    "org.enginehub.squirrelid" to "com.sk89q.worldguard.util.profile",
+)
+
+tasks.register<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("jar") {
+    configurations = listOf(project.configurations["shade"])
+    archiveClassifier.set("")
+
+    // Yeet module-info's
+    exclude("module-info.class")
+
+    dependencies {
+        exclude(dependency("com.google.guava:guava"))
+        exclude(dependency("com.google.code.gson:gson"))
+        exclude(dependency("com.google.errorprone:error_prone_annotations"))
+        exclude(dependency("com.google.guava:failureaccess"))
+        exclude(dependency("org.checkerframework:checker-qual"))
+        exclude(dependency("org.jetbrains:annotations"))
+        exclude(dependency("org.apache.logging.log4j:log4j-api"))
+        exclude(dependency("com.google.code.findbugs:jsr305"))
+        exclude {
+            it.moduleGroup == "org.jetbrains.kotlin"
+        }
+    }
+
+    relocations.forEach { (from, to) ->
+        relocate(from, to)
+    }
+}
+val altConfigFiles = { artifactType: String ->
+    val deps = configurations["shade"].incoming.dependencies
+        .filterIsInstance<ModuleDependency>()
+        .map { it.copy() }
+        .map { dependency ->
+            val category = dependency.attributes.getAttribute(Category.CATEGORY_ATTRIBUTE)?.name
+            if (category == Category.REGULAR_PLATFORM || category == Category.ENFORCED_PLATFORM) {
+                return@map dependency
+            }
+            try {
+                dependency.artifact {
+                    name = dependency.name
+                    type = artifactType
+                    extension = "jar"
+                    classifier = artifactType
+                }
+            } catch (e: Exception) {
+                throw RuntimeException("Failed to add artifact to dependency: $dependency", e)
+            }
+            dependency
+        }
+
+    files(configurations.detachedConfiguration(*deps.toTypedArray())
+        .resolvedConfiguration.lenientConfiguration.artifacts
+        .filter { it.classifier == artifactType }
+        .map { zipTree(it.file) })
+}
+tasks.register<Jar>("sourcesJar") {
+    from({
+        altConfigFiles("sources")
+    })
+
+    // Yeet module-info's
+    exclude("module-info.java")
+
+    relocations.forEach { (from, to) ->
+        val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)")
+        val textPattern = Regex.fromLiteral(from)
+        eachFile {
+            filter {
+                it.replaceFirst(textPattern, to)
+            }
+            path = path.replaceFirst(filePattern, "$1${to.replace('.', '/')}$2")
+        }
+    }
+    archiveClassifier.set("sources")
+}
+
+tasks.named("assemble").configure {
+    dependsOn("jar", "sourcesJar")
+}
+
+project.apply<LibsConfigPluginHack>()
+
+val libsComponent = project.components["libs"] as AdhocComponentWithVariants
+
+val apiElements = project.configurations.register("apiElements") {
+    isVisible = false
+    description = "API elements for libs"
+    isCanBeResolved = false
+    isCanBeConsumed = true
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_API))
+        attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
+        attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+    }
+    outgoing.artifact(tasks.named("jar"))
+}
+
+val runtimeElements = project.configurations.register("runtimeElements") {
+    isVisible = false
+    description = "Runtime elements for libs"
+    isCanBeResolved = false
+    isCanBeConsumed = true
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
+        attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 21)
+    }
+    outgoing.artifact(tasks.named("jar"))
+}
+
+val sourcesElements = project.configurations.register("sourcesElements") {
+    isVisible = false
+    description = "Source elements for libs"
+    isCanBeResolved = false
+    isCanBeConsumed = true
+    attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.DOCUMENTATION))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+        attribute(DocsType.DOCS_TYPE_ATTRIBUTE, project.objects.named(DocsType.SOURCES))
+    }
+    outgoing.artifact(tasks.named("sourcesJar"))
+}
+
+libsComponent.addVariantsFromConfiguration(apiElements.get()) {
+    mapToMavenScope("compile")
+}
+
+libsComponent.addVariantsFromConfiguration(runtimeElements.get()) {
+    mapToMavenScope("runtime")
+}
+
+libsComponent.addVariantsFromConfiguration(sourcesElements.get()) {
+    mapToMavenScope("runtime")
+}
+
+configure<PublishingExtension> {
+    publications {
+        register<MavenPublication>("maven") {
+            from(libsComponent)
+        }
+    }
+}
+
+if (project != project(":worldguard-libs:core")) {
+    evaluationDependsOn(":worldguard-libs:core")
+    configurations["shade"].shouldResolveConsistentlyWith(project(":worldguard-libs:core").configurations["shade"])
+}

build-logic/src/main/kotlin/buildlogic.platform.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    id("com.github.johnrengelman.shadow")
+    id("buildlogic.core-and-platform")
+}
+
+tasks.named<com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar>("shadowJar") {
+    archiveClassifier.set("dist")
+    dependencies {
+        include(project(":worldguard-libs:core"))
+        include(project(":worldguard-core"))
+
+        relocate("org.flywaydb", "com.sk89q.worldguard.internal.flywaydb") {
+            include(dependency("org.flywaydb:flyway-core"))
+        }
+        exclude("com.google.code.findbugs:jsr305")
+    }
+    exclude("GradleStart**")
+    exclude(".cache")
+    exclude("LICENSE*")
+    exclude("META-INF/maven/**")
+    minimize()
+}
+val javaComponent = components["java"] as AdhocComponentWithVariants
+// I don't think we want this published (it's the shadow jar)
+javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
+    skip()
+}
+
+afterEvaluate {
+    tasks.named<Jar>("jar") {
+        val version = project(":worldguard-core").version
+        inputs.property("version", version)
+        val attributes = mutableMapOf(
+            "Implementation-Version" to version,
+            "WorldGuard-Version" to version,
+        )
+        manifest.attributes(attributes)
+    }
+}

build-logic/src/main/kotlin/buildlogic/GradleExtras.kt

@@ -0,0 +1,24 @@
+package buildlogic
+
+import org.gradle.api.Project
+import org.gradle.api.artifacts.MinimalExternalModuleDependency
+import org.gradle.api.artifacts.VersionCatalog
+import org.gradle.api.artifacts.VersionCatalogsExtension
+import org.gradle.api.artifacts.VersionConstraint
+import org.gradle.api.plugins.ExtraPropertiesExtension
+import org.gradle.api.provider.Provider
+import org.gradle.kotlin.dsl.getByType
+
+val Project.ext: ExtraPropertiesExtension
+    get() = extensions.getByType()
+
+val Project.stringyLibs: VersionCatalog
+    get() = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+fun VersionCatalog.getLibrary(name: String): Provider<MinimalExternalModuleDependency> = findLibrary(name).orElseThrow {
+    error("Library $name not found in version catalog")
+}
+
+fun VersionCatalog.getVersion(name: String): VersionConstraint = findVersion(name).orElseThrow {
+    error("Version $name not found in version catalog")
+}

build.gradle.kts

@@ -0,0 +1,17 @@
+import org.ajoberstar.grgit.Grgit
+
+plugins {
+    id("buildlogic.common")
+    id("buildlogic.artifactory-root")
+}
+
+if (!project.hasProperty("gitCommitHash")) {
+    apply(plugin = "org.ajoberstar.grgit")
+    ext["gitCommitHash"] = try {
+        extensions.getByName<Grgit>("grgit").head()?.abbreviatedId
+    } catch (e: Exception) {
+        logger.warn("Error getting commit hash", e)
+
+        "no.git.id"
+    }
+}

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -0,0 +1,86 @@
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.api.plugins.quality.CheckstyleExtension
+import org.gradle.api.tasks.compile.JavaCompile
+import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.api.tasks.testing.Test
+import org.gradle.external.javadoc.StandardJavadocDocletOptions
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.dependencies
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.withType
+
+fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int = 8, banSlf4j: Boolean = true) {
+    applyCommonConfiguration()
+    apply(plugin = "eclipse")
+    apply(plugin = "idea")
+    apply(plugin = "checkstyle")
+
+    tasks
+        .withType<JavaCompile>()
+        .matching { it.name == "compileJava" || it.name == "compileTestJava" }
+        .configureEach {
+            val disabledLint = listOf(
+                "processing", "path", "fallthrough", "serial"
+            )
+            options.release.set(javaRelease)
+            options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })
+            options.isDeprecation = true
+            options.encoding = "UTF-8"
+            options.compilerArgs.add("-parameters")
+        }
+
+    configure<CheckstyleExtension> {
+        configFile = rootProject.file("config/checkstyle/checkstyle.xml")
+        toolVersion = "9.1"
+    }
+
+    tasks.withType<Test>().configureEach {
+        useJUnitPlatform()
+    }
+
+    dependencies {
+        "compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
+        "testImplementation"("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT}")
+        "testImplementation"("org.mockito:mockito-core:${Versions.MOCKITO}")
+        "testImplementation"("org.mockito:mockito-junit-jupiter:${Versions.MOCKITO}")
+        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
+    }
+
+    // Java 8 turns on doclint which we fail
+    tasks.withType<Javadoc>().configureEach {
+        options.encoding = "UTF-8"
+        (options as StandardJavadocDocletOptions).apply {
+            addStringOption("Xdoclint:none", "-quiet")
+            tags(
+                "apiNote:a:API Note:",
+                "implSpec:a:Implementation Requirements:",
+                "implNote:a:Implementation Note:"
+            )
+        }
+    }
+
+    configure<JavaPluginExtension> {
+        disableAutoTargetJvm()
+        withJavadocJar()
+        if (sourcesJar) {
+            withSourcesJar()
+        }
+    }
+
+    if (banSlf4j) {
+        configurations["compileClasspath"].apply {
+            resolutionStrategy.componentSelection {
+                withModule("org.slf4j:slf4j-api") {
+                    reject("No SLF4J allowed on compile classpath")
+                }
+            }
+        }
+    }
+
+    tasks.named("check").configure {
+        dependsOn("checkstyleMain", "checkstyleTest")
+    }
+}

config/checkstyle/checkstyle.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
+        "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+<module name="Checker">
+  <!-- Tabs are strictly banned -->
+  <module name="FileTabCharacter"/>
+
+  <module name="SuppressionFilter">
+    <property name="file" value="${config_loc}/suppressions.xml"/>
+  </module>
+
+
+
+  <module name="TreeWalker">
+    <!-- Important basics -->
+    <!-- <module name="PackageDeclaration"/> Unlikely that we would miss this in a PR -->
+    <module name="OuterTypeFilename"/> <!-- TypeName -> TypeName.java -->
+
+    <!--
+    Control package usage, so people don't insert Bukkit into WG where it shouldn't belong, etc.
+    It is a bit draconian, so update as necessary!
+    -->
+    <module name="ImportControl">
+      <property name="file" value="${config_loc}/import-control.xml"/>
+    </module>
+
+    <!-- Code -->
+    <module name="HideUtilityClassConstructor"/> <!-- Utility classes should not have a constructor -->
+    <module name="CovariantEquals"/>
+    <module name="EqualsHashCode"/> <!-- equals() and hashCode() go together -->
+    <module name="NestedTryDepth"> <!-- SHOULD not need to adjust this -->
+      <property name="max" value="2"/>
+    </module>
+    <module name="SuperFinalize"/> <!-- We don't actually use this -->
+
+    <!-- Style -->
+    <module name="LeftCurly"> <!-- Left brace never goes on another line -->
+      <property name="option" value="eol"/>
+    </module> <!-- We don't check right brace -->
+    <module name="DefaultComesLast"/> <!-- default case in switch should be last -->
+    <module name="GenericWhitespace"/>
+
+    <!-- Naming -->
+    <module name="ClassTypeParameterName">
+      <property name="format" value="^[A-Z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName">
+      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="MemberName">
+      <property name="format" value="^[a-z_][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="MethodName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <!-- <module name="PackageName"/> Unlikely that we would miss this in a PR -->
+    <module name="ParameterName"/>
+    <!-- <module name="TypeName"/> Unlikely that we would miss this in a PR -->
+  </module>
+
+</module>

config/checkstyle/import-control.xml

@@ -0,0 +1,38 @@
+<!DOCTYPE import-control PUBLIC
+    "-//Puppy Crawl//DTD Import Control 1.1//EN"
+    "http://www.puppycrawl.com/dtds/import_control_1_1.dtd">
+
+<import-control pkg="com.sk89q">
+  <allow pkg="java"/>
+  <allow pkg="javax"/>
+  <allow pkg="org.junit"/>
+  <allow pkg="org.hamcrest"/>
+  <allow pkg="junit.framework"/>
+  <allow pkg="com.sk89q"/>
+  <allow pkg="com.google.common"/>
+
+  <subpackage name="worldguard">
+    <allow pkg="org.khelekore"/>
+    <allow pkg="org.flywaydb"/>
+    <allow pkg="org.yaml"/>
+    <allow pkg="org.enginehub.piston"/>
+
+    <subpackage name="util.profile.resolver">
+      <allow pkg="org.bukkit"/>
+      <allow pkg="io.papermc.lib"/>
+      <allow pkg="com.destroystokyo.paper"/>
+    </subpackage>
+
+    <subpackage name="bukkit">
+      <allow pkg="org.bukkit"/>
+      <allow pkg="org.bstats.bukkit"/>
+      <allow pkg="org.bstats.charts"/>
+      <allow pkg="io.papermc.lib"/>
+      <allow pkg="com.destroystokyo.paper"/>
+      <allow pkg="io.papermc.paper"/>
+      <allow pkg="org.spigotmc" />
+    </subpackage>
+
+  </subpackage>
+
+</import-control>

config/checkstyle/suppressions.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+        "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
+        "https://checkstyle.org/dtds/suppressions_1_2.dtd">
+<suppressions>
+    <suppress files="ProtectedRegion.java" checks="EqualsHashCode"/>
+</suppressions>

gradle.properties

@@ -0,0 +1,4 @@
+group=com.sk89q.worldguard
+version=7.1.0-SNAPSHOT
+
+org.gradle.parallel=true

gradle/gradle-daemon-jvm.properties

@@ -0,0 +1,2 @@
+#This file is generated by updateDaemonJvm
+toolchainVersion=21

gradle/libs.versions.toml

@@ -0,0 +1,66 @@
+[versions]
+worldedit = "7.3.0"
+
+# Minimum versions we apply to make dependencies support newer Java
+minimumAsm = "9.7"
+minimumJdependency = "2.10"
+minimumTinyRemapper = "0.8.11"
+
+# lang-version = ""
+
+[libraries]
+
+licenser = "gradle.plugin.org.cadixdev.gradle:licenser:0.6.1"
+grgit = "org.ajoberstar.grgit:grgit-gradle:5.2.2"
+shadow = "com.github.johnrengelman:shadow:8.1.1"
+jfrog-buildinfo = "org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0"
+
+squirrelid = "org.enginehub:squirrelid:0.3.2"
+
+autoService = "com.google.auto.service:auto-service:1.1.1"
+
+jsr305 = "com.google.code.findbugs:jsr305:3.0.2"
+jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
+
+junit-bom = "org.junit:junit-bom:5.10.2"
+junit-jupiter-api.module = "org.junit.jupiter:junit-jupiter-api"
+junit-jupiter-params.module = "org.junit.jupiter:junit-jupiter-params"
+junit-jupiter-engine.module = "org.junit.jupiter:junit-jupiter-engine"
+
+spigot = "org.spigotmc:spigot-api:1.21-R0.1-SNAPSHOT"
+paperApi = "io.papermc.paper:paper-api:1.21-R0.1-SNAPSHOT"
+paperLib = "io.papermc:paperlib:1.0.8"
+
+dummypermscompat = "com.sk89q:dummypermscompat:1.10"
+bstats-bukkit = "org.bstats:bstats-bukkit:2.2.1"
+
+prtree = "org.khelekore:prtree:1.5.0"
+
+flyway-core = "org.flywaydb:flyway-core:3.0"
+
+commandbook = "com.sk89q:commandbook:2.3"
+
+hamcrest-library = "org.hamcrest:hamcrest-library:2.2"
+
+# Mojang-provided libraries, CHECK AGAINST MINECRAFT for versions
+guava = "com.google.guava:guava:32.1.3-jre!!"
+log4j-bom = "org.apache.logging.log4j:log4j-bom:2.22.1!!"
+gson = "com.google.code.gson:gson:2.10.1!!"
+fastutil = "it.unimi.dsi:fastutil:8.5.12!!"
+
+# Bukkit-provided libraries, CHECK AGAINST SPIGOT for versions
+# Note that we need to balance support for older MC versus working at all on newer ones, so the exact versions here
+# may not be the same as the ones in the latest Bukkit API.
+snakeyaml = "org.yaml:snakeyaml:2.0"
+
+[libraries.worldedit-core]
+module = "com.sk89q.worldedit:worldedit-core"
+version.ref = "worldedit"
+
+[libraries.worldedit-bukkit]
+module = "com.sk89q.worldedit:worldedit-bukkit"
+version.ref = "worldedit"
+
+[libraries.worldedit-libs-ap]
+module = "com.sk89q.worldedit.worldedit-libs:ap"
+version.ref = "worldedit"

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

gradlew

@@ -0,0 +1,249 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+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
+    if ! command -v java >/dev/null 2>&1
+    then
+        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
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@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
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@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="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+: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 %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 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!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

pom.xml

@@ -1,327 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.sk89q</groupId>
-  <artifactId>worldguard</artifactId>
-  <version>5.9.1-SNAPSHOT</version>
-  <packaging>jar</packaging>
-  
-  <!-- Project information -->
-  <name>WorldGuard</name>
-  <description>WorldGuard protects your Minecraft servers.</description>
-  <licenses>
-    <license>
-      <name>GNU General Public License 2.0</name>
-      <url>LICENSE.txt</url>
-      <distribution>repo</distribution>
-      <comments>License on all contributions</comments>
-    </license>
-  </licenses>
-  
-  <issueManagement>
-    <system>YouTrack</system>
-    <url>http://youtrack.sk89q.com</url>
-  </issueManagement>
-  
-  <ciManagement>
-    <system>Jenkins</system>
-    <url>http://build.sk89q.com</url>
-  </ciManagement>
-  
-  <scm>
-    <connection>scm:git:git://github.com/sk89q/worldguard.git</connection>
-    <developerConnection>scm:git:git@github.com:sk89q/worldguard.git</developerConnection>
-    <url>https://github.com/sk89q/worldguard</url>
-    <tag>master</tag>
-  </scm>
-  
-  <mailingLists>
-    <mailingList>
-      <name>Developer Discussion</name>
-      <archive>https://groups.google.com/d/forum/sk-dev-discuss</archive>
-    </mailingList>
-  </mailingLists>
-  
-  <distributionManagement>
-    <site>
-      <id>sk89q-docs-upload</id>
-      <url>ftp://sk89q-maven-deploy/worldguard/</url>
-    </site>
-    <repository>
-      <id>maven.sk89q.com</id>
-      <url>http://maven.sk89q.com/artifactory/libs-release-local</url>
-    </repository>
-    <snapshotRepository>
-      <id>maven.sk89q.com-snapshot</id>
-      <url>http://maven.sk89q.com/artifactory/libs-snapshot-local</url>
-    </snapshotRepository>
-  </distributionManagement>
-  
-  <properties> <!-- Fix encoding warnings -->
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-  
-  <repositories>
-    <repository>
-      <id>sk89q-repo</id>
-      <url>http://maven.sk89q.com/repo/</url>
-    </repository>
-    <repository>
-      <id>zml-repo</id>
-      <url>http://files.zachsthings.com/repo</url>
-    </repository>
-    <repository>
-      <id>bukkit-repo</id>
-      <url>http://repo.bukkit.org/content/groups/public</url>
-    </repository>
-  </repositories>
-  
-  <dependencies>
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>worldedit</artifactId>
-      <version>5.5.8</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.7.2-R0.3</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.sk89q</groupId>
-      <artifactId>commandbook</artifactId>
-      <version>2.3</version>
-      <scope>compile</scope>
-      <type>jar</type>
-      <exclusions>
-        <exclusion>
-          <groupId>com.zachsthings.libcomponents</groupId>
-          <artifactId>libcomponents-bukkit</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.spout</groupId>
-          <artifactId>spoutapi</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    
-    <dependency>
-      <groupId>com.nijikokun</groupId>
-      <artifactId>iconomy</artifactId>
-      <version>5.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.khelekore</groupId>
-      <artifactId>prtree</artifactId>
-      <version>1.5.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>net.sf.opencsv</groupId>
-      <artifactId>opencsv</artifactId>
-      <version>2.0</version>
-      <scope>compile</scope>
-      <type>jar</type>
-    </dependency>
-    
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-      <type>jar</type>
-    </dependency>
-  </dependencies>
-  
-  <build>
-    <defaultGoal>install</defaultGoal>
-    <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
-    
-    <extensions> <!-- Used for uploading the docs -->
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-         <artifactId>wagon-ftp</artifactId>
-         <version>1.0-beta-6</version>
-      </extension>
-    </extensions>
-
-    <resources>
-      <resource>
-        <targetPath>.</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>plugin.yml</include>
-        </includes>
-      </resource>
-      <resource>
-        <targetPath>defaults/</targetPath>
-        <filtering>true</filtering>
-        <directory>${basedir}/src/main/resources/</directory>
-        <includes>
-          <include>config.yml</include>
-          <include>config_world.yml</include>
-          <include>blacklist.txt</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>true</addMavenDescriptor>
-            <manifest>
-              <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
-              <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-            </manifest>
-            <manifestEntries>
-              <Class-Path>WorldGuard/WorldEdit.jar lib/WorldEdit.jar ../lib/WorldEdit.jar ../WorldEdit.jar</Class-Path>
-            </manifestEntries>
-          </archive>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>1.4</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>net.sf.opencsv:opencsv</include>
-                  <include>org.khelekore:prtree</include>
-                </includes>
-              </artifactSet>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
-        <configuration>
-          <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
-        </configuration>
-        <executions>
-          <execution>
-            <id>release</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.4.1</version>
-        <configuration>
-          <preparationGoals>assembly:assembly</preparationGoals>
-          <goals>assembly:assembly</goals>
-          <tagNameFormat>@{project.version}</tagNameFormat>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>3.1</version>
-        <configuration>
-          <reportPlugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.5</version>
-              <reportSets>
-                <reportSet>
-                  <reports>
-                    <report>license</report>
-                    <report>index</report>
-                  </reports>
-                </reportSet>
-              </reportSets>
-            </plugin>
-            
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-javadoc-plugin</artifactId>
-              <version>2.8.1</version>
-            </plugin>
-          </reportPlugins>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  
-  <profiles>
-    <!-- Attach javadocs and source .jars -->
-    <profile>
-      <id>attach-docs</id>
-      
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.2.1</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.8.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>

settings.gradle.kts

@@ -0,0 +1,33 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+    }
+}
+plugins {
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+}
+
+logger.lifecycle("""
+*******************************************
+ 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 Discord! https://discord.gg/enginehub
+
+ Output files will be in [subproject]/build/libs
+*******************************************
+""")
+
+rootProject.name = "worldguard"
+
+includeBuild("build-logic")
+
+include("worldguard-libs")
+include("worldguard-libs:core")
+
+listOf("bukkit", "core").forEach {
+    include("worldguard-$it")
+}

src/main/assembly/default.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly
-  xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <files>
-    <file>
-      <source>${project.build.directory}/${artifactId}-${project.version}.jar</source>
-      <destName>WorldGuard.jar</destName>
-      <outputDirectory>/</outputDirectory>
-      <filtered>false</filtered>
-    </file>
-    <file>
-      <source>README.html</source>
-      <outputDirectory>/</outputDirectory>
-      <filtered>true</filtered>
-    </file>
-  </files>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>LICENSE.txt</include>
-        <include>NOTICE.txt</include>
-        <include>CHANGELOG.txt</include>
-        <include>contrib/blacklist_table.sql</include>
-        <include>contrib/region_storage.sql</include>
-        <include>contrib/region_storage_update_20110325.sql</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-</assembly>

src/main/java/com/sk89q/worldguard/LocalPlayer.java

@@ -1,94 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard;
-
-import com.sk89q.worldedit.Vector;
-
-public abstract class LocalPlayer {
-    /**
-     * Get a player's name.
-     * 
-     * @return The player's name
-     */
-    public abstract String getName();
-    
-    /**
-     * Returns true if the 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 the player's position.
-     * 
-     * @return The player's position
-     */
-    public abstract Vector getPosition();
-    
-    /**
-     * Kick the player.
-     * 
-     * @param msg The message to kick the player with
-     */
-    public abstract void kick(String msg);
-    
-    /**
-     * Ban the player.
-     * 
-     * @param msg The message to ban the player with
-     */
-    public abstract void ban(String msg);
-    
-    /**
-     * Send the player a message;
-     * 
-     * @param msg The message to send to the player
-     */
-    public abstract void printRaw(String msg);
-    
-    /**
-     * Get the player's list of groups.
-     * 
-     * @return The groups this player is in
-     */
-    public abstract String[] getGroups();
-    
-    /**
-     * Returns whether a player has permission.
-     * 
-     * @param perm The permission to check
-     * @return Whether this player has {@code perm}
-     */
-    public abstract boolean hasPermission(String perm);
-    
-    @Override
-    public boolean equals(Object obj) {
-
-        return obj instanceof LocalPlayer && ((LocalPlayer) obj).getName().equals(getName());
-
-    }
-    
-    @Override
-    public int hashCode() {
-        return getName().hashCode();
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/Blacklist.java

@@ -1,334 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.ChatColor;
-
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-
-/**
- *
- * @author sk89q
- */
-public abstract class Blacklist {
-
-    /**
-     * List of entries by block ID.
-     */
-    private Map<Integer,List<BlacklistEntry>> blacklist
-            = new HashMap<Integer,List<BlacklistEntry>>();
-    /**
-     * Logger.
-     */
-    private BlacklistLogger blacklistLogger = new BlacklistLogger();
-    /**
-     * Last event.
-     */
-    private BlacklistEvent lastEvent;
-    /**
-     * Used to prevent flooding.
-     */
-    Map<String,BlacklistTrackedEvent> lastAffected =
-            new HashMap<String,BlacklistTrackedEvent>();
-
-    private boolean useAsWhitelist;
-
-    private final Logger logger;
-
-    public Blacklist(Boolean useAsWhitelist, Logger logger) {
-        this.useAsWhitelist = useAsWhitelist;
-        this.logger = logger;
-    }
-
-    /**
-     * Returns whether the list is empty.
-     *
-     * @return whether the blacklist is empty
-     */
-    public boolean isEmpty() {
-        return blacklist.isEmpty();
-    }
-
-    /**
-     * Get the entries for an item or list.
-     *
-     * @param id The item id to get blacklist information for
-     * @return The blacklist entries for {@code id}
-     */
-    public List<BlacklistEntry> getEntries(int id) {
-        return blacklist.get(id);
-    }
-
-    /**
-     * Get the number of individual items that have blacklist entries.
-     *
-     * @return The number of items in the blacklist
-     */
-    public int getItemCount() {
-        return blacklist.size();
-    }
-
-    /**
-     * Returns whether the blacklist is used as a whitelist.
-     *
-     * @return whether the blacklist is be used as a whitelist
-     */
-    public boolean isWhitelist() {
-        return useAsWhitelist;
-    }
-
-    /**
-     * Get the logger.
-     *
-     * @return The logger used in this blacklist
-     */
-    public BlacklistLogger getLogger() {
-        return blacklistLogger;
-    }
-
-    /**
-     * Method to handle the event.
-     *
-     * @param event The event to check
-     * @param forceRepeat Whether to force quickly repeating notifications
-     * @param silent Whether to force-deny notifications
-     * @return Whether the event is allowed
-     */
-    public boolean check(BlacklistEvent event, boolean forceRepeat, boolean silent) {
-        List<BlacklistEntry> entries = getEntries(event.getType());
-        if (entries == null) {
-            return true;
-        }
-        boolean ret = true;
-        for (BlacklistEntry entry : entries) {
-            if (!entry.check(useAsWhitelist, event, forceRepeat, silent)) {
-                ret = false;
-            }
-        }
-        return ret;
-    }
-
-    /**
-     * Load the blacklist.
-     *
-     * @param file The file to load from
-     * @throws IOException if an error occurred reading from the file
-     */
-    public void load(File file) throws IOException {
-        FileReader input = null;
-        Map<Integer,List<BlacklistEntry>> blacklist =
-                new HashMap<Integer,List<BlacklistEntry>>();
-
-        try {
-            input = new FileReader(file);
-            BufferedReader buff = new BufferedReader(input);
-
-            String line;
-            List<BlacklistEntry> currentEntries = null;
-            while ((line = buff.readLine()) != null) {
-                line = line.trim();
-
-                // Blank line
-                if (line.length() == 0) {
-                    continue;
-                } else if (line.charAt(0) == ';' || line.charAt(0) == '#') {
-                    continue;
-                }
-
-                if (line.matches("^\\[.*\\]$")) {
-                    String[] items = line.substring(1, line.length() - 1).split(",");
-                    currentEntries = new ArrayList<BlacklistEntry>();
-
-                    for (String item : items) {
-                        int id;
-
-                        try {
-                            id = Integer.parseInt(item.trim());
-                        } catch (NumberFormatException e) {
-                            id = getItemID(item.trim());
-                            if (id == 0) {
-                                logger.log(Level.WARNING, "Unknown block name: "
-                                        + item);
-                                break;
-                            }
-                        }
-
-                        BlacklistEntry entry = new BlacklistEntry(this);
-                        if (blacklist.containsKey(id)) {
-                            blacklist.get(id).add(entry);
-                        } else {
-                            List<BlacklistEntry> entries = new ArrayList<BlacklistEntry>();
-                            entries.add(entry);
-                            blacklist.put(id, entries);
-                        }
-                        currentEntries.add(entry);
-                    }
-                } else if (currentEntries != null) {
-                    String[] parts = line.split("=");
-
-                    if (parts.length == 1) {
-                        logger.log(Level.WARNING, "Found option with no value "
-                                + file.getName() + " for '" + line + "'");
-                        continue;
-                    }
-
-                    boolean unknownOption = false;
-
-                    for (BlacklistEntry entry : currentEntries) {
-                        if (parts[0].equalsIgnoreCase("ignore-groups")) {
-                            entry.setIgnoreGroups(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("ignore-perms")) {
-                            entry.setIgnorePermissions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-break")) {
-                            entry.setBreakActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-destroy-with")) {
-                            entry.setDestroyWithActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-place")) {
-                            entry.setPlaceActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-interact")) {
-                            entry.setInteractActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-use")) {
-                            entry.setUseActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-drop")) {
-                            entry.setDropActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("on-acquire")) {
-                            entry.setAcquireActions(parts[1].split(","));
-                        } else if (parts[0].equalsIgnoreCase("message")) {
-                            entry.setMessage(parts[1].trim());
-                        } else if (parts[0].equalsIgnoreCase("comment")) {
-                            entry.setComment(parts[1].trim());
-                        } else {
-                            unknownOption = true;
-                        }
-                    }
-
-                    if (unknownOption) {
-                        logger.log(Level.WARNING, "Unknown option '" + parts[0]
-                                + "' in " + file.getName() + " for '" + line + "'");
-                    }
-                } else {
-                    logger.log(Level.WARNING, "Found option with no heading "
-                            + file.getName() + " for '" + line + "'");
-                }
-            }
-
-            this.blacklist = blacklist;
-        } finally {
-            try {
-                if (input != null) {
-                    input.close();
-                }
-            } catch (IOException ignore) {
-            }
-        }
-    }
-
-    /**
-     * Get the last event.
-     *
-     * @return The last event
-     */
-    public BlacklistEvent getLastEvent() {
-        return lastEvent;
-    }
-
-    /**
-     * Notify administrators.
-     *
-     * @param event The event to notify about
-     * @param comment The comment to notify with
-     */
-    public void notify(BlacklistEvent event, String comment) {
-        lastEvent = event;
-
-        broadcastNotification(ChatColor.GRAY + "WG: "
-                + ChatColor.LIGHT_PURPLE + event.getPlayer().getName()
-                + ChatColor.GOLD + " (" + event.getDescription() + ") "
-                + ChatColor.WHITE
-                + getFriendlyItemName(event.getType())
-                + (comment != null ? " (" + comment + ")" : "") + ".");
-    }
-
-    /**
-     * Sends a notification to all subscribing users.
-     *
-     * @param msg The message to broadcast
-     */
-    public abstract void broadcastNotification(String msg);
-
-    /**
-     * Forget a player.
-     *
-     * @param player The player to forget
-     */
-    public void forgetPlayer(LocalPlayer player) {
-        lastAffected.remove(player.getName());
-    }
-
-    /**
-     * Forget all players.
-     */
-    public void forgetAllPlayers() {
-        lastAffected.clear();
-    }
-
-    /**
-     * Get an item's ID from its name.
-     *
-     * @param name the name of the item to look up
-     * @return the id for name if contained in ItemId, else -1
-     */
-    private static int getItemID(String name) {
-        ItemType type = ItemType.lookup(name);
-        if (type != null) {
-            return type.getID();
-        } else {
-            return -1;
-        }
-    }
-
-    /**
-     * Get an item's friendly name with its ID.
-     *
-     * @param id The id to look up
-     * @return The item's friendly name
-     */
-    private static String getFriendlyItemName(int id) {
-        ItemType type = ItemType.fromID(id);
-        if (type != null) {
-            return type.getName() + " (#" + id + ")";
-        } else {
-            return "#" + id + "";
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/BlacklistEntry.java

@@ -1,424 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.bukkit.ChatColor;
-
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-
-/**
- *
- * @author sk89q
- */
-public class BlacklistEntry {
-    /**
-     * Parent blacklist entry.
-     */
-    private Blacklist blacklist;
-
-    /**
-     * List of groups to not affect.
-     */
-    private Set<String> ignoreGroups;
-
-    /**
-     * List of permissions to not affect.
-     */
-    private Set<String> ignorePermissions;
-
-    private String[] breakActions;
-    private String[] destroyWithActions;
-    private String[] placeActions;
-    private String[] interactActions;
-    private String[] useActions;
-    private String[] dropActions;
-    private String[] acquireActions;
-
-    private String message;
-    private String comment;
-
-    /**
-     * Construct the object.
-     *
-     * @param blacklist The blacklist that contains this entry
-     */
-    public BlacklistEntry(Blacklist blacklist) {
-        this.blacklist = blacklist;
-    }
-
-    /**
-     * @return the ignoreGroups
-     */
-    public String[] getIgnoreGroups() {
-        return ignoreGroups.toArray(new String[ignoreGroups.size()]);
-    }
-
-    /**
-     * @return the ignoreGroups
-     */
-    public String[] getIgnorePermissions() {
-        return ignorePermissions.toArray(new String[ignorePermissions.size()]);
-    }
-
-    /**
-     * @param ignoreGroups the ignoreGroups to set
-     */
-    public void setIgnoreGroups(String[] ignoreGroups) {
-        Set<String> ignoreGroupsSet = new HashSet<String>();
-        for (String group : ignoreGroups) {
-            ignoreGroupsSet.add(group.toLowerCase());
-        }
-        this.ignoreGroups = ignoreGroupsSet;
-    }
-
-    /**
-     * @param ignorePermissions the ignorePermissions to set
-     */
-    public void setIgnorePermissions(String[] ignorePermissions) {
-        Set<String> ignorePermissionsSet = new HashSet<String>();
-        Collections.addAll(ignorePermissionsSet, ignorePermissions);
-        this.ignorePermissions = ignorePermissionsSet;
-    }
-
-    /**
-     * @return The actions that occur when breaking
-     */
-    public String[] getBreakActions() {
-        return breakActions;
-    }
-
-    /**
-     * @param actions The actions to occur when breaking
-     */
-    public void setBreakActions(String[] actions) {
-        this.breakActions = actions;
-    }
-
-    /**
-     * @return The actions that occur when destroying with a specific item
-     */
-    public String[] getDestroyWithActions() {
-        return destroyWithActions;
-    }
-
-    /**
-     * @param actions The actions to occur when destroying with an item
-     */
-    public void setDestroyWithActions(String[] actions) {
-        this.destroyWithActions = actions;
-    }
-
-    /**
-     * @return The actions that will occur when placing
-     */
-    public String[] getPlaceActions() {
-        return placeActions;
-    }
-
-    /**
-     * @param actions The actions to occur when placing
-     */
-    public void setPlaceActions(String[] actions) {
-        this.placeActions = actions;
-    }
-
-    /**
-     * @return The actions that will occur when interacting
-     */
-    public String[] getInteractActions() {
-        return interactActions;
-    }
-
-    /**
-     * @param actions The actions to occur when interacting
-     */
-    public void setInteractActions(String[] actions) {
-        this.interactActions = actions;
-    }
-
-    /**
-     * @return The actions that will occur when using
-     */
-    public String[] getUseActions() {
-        return useActions;
-    }
-
-    /**
-     * @param actions The actions to occur when using
-     */
-    public void setUseActions(String[] actions) {
-        this.useActions = actions;
-    }
-
-    /**
-     * @return The actions that will occur when dropping
-     */
-    public String[] getDropActions() {
-        return dropActions;
-    }
-
-    /**
-     * @param actions The actions to occur when dropping
-     */
-    public void setDropActions(String[] actions) {
-        this.dropActions = actions;
-    }
-
-    /**
-     * @return The actions that will occur when acquiring
-     */
-    public String[] getAcquireActions() {
-        return acquireActions;
-    }
-
-    /**
-     * @param actions The actions to occur when acquiring
-     */
-    public void setAcquireActions(String[] actions) {
-        this.acquireActions = actions;
-    }
-
-    /**
-     * @return the message
-     */
-    public String getMessage() {
-        return message;
-    }
-
-    /**
-     * @param message the message to set
-     */
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    /**
-     * @return the comment
-     */
-    public String getComment() {
-        return comment;
-    }
-
-    /**
-     * @param comment the comment to set
-     */
-    public void setComment(String comment) {
-        this.comment = comment;
-    }
-
-    /**
-     * Returns true if this player should be ignored.
-     *
-     * @param player The player to check
-     * @return whether this player should be ignored for blacklist blocking
-     */
-    public boolean shouldIgnore(LocalPlayer player) {
-        if (ignoreGroups != null) {
-            for (String group : player.getGroups()) {
-                if (ignoreGroups.contains(group.toLowerCase())) {
-                    return true;
-                }
-            }
-        }
-
-        if (ignorePermissions != null) {
-            for (String perm : ignorePermissions) {
-                if (player.hasPermission(perm)) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get the associated actions with an event.
-     *
-     * @param event The event to check
-     * @return The actions for the given event
-     */
-    private String[] getActions(BlacklistEvent event) {
-        if (event instanceof BlockBreakBlacklistEvent) {
-            return breakActions;
-
-        } else if (event instanceof BlockPlaceBlacklistEvent) {
-            return placeActions;
-
-        } else if (event instanceof BlockInteractBlacklistEvent) {
-            return interactActions;
-
-        } else if (event instanceof DestroyWithBlacklistEvent) {
-            return destroyWithActions;
-
-        } else if (event instanceof ItemAcquireBlacklistEvent) {
-            return acquireActions;
-
-        } else if (event instanceof ItemDropBlacklistEvent) {
-            return dropActions;
-
-        } else if (event instanceof ItemUseBlacklistEvent) {
-            return useActions;
-
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Method to handle the event.
-     *
-     * @param useAsWhitelist Whether this entry is buing used in a whitelist
-     * @param event The event to check
-     * @param forceRepeat Whether to force repeating notifications even within the delay limit
-     * @param silent Whether to prevent notifications from happening
-     * @return Whether the action was allowed
-     */
-    public boolean check(boolean useAsWhitelist, BlacklistEvent event, boolean forceRepeat, boolean silent) {
-        LocalPlayer player = event.getPlayer();
-
-        if (shouldIgnore(player)) {
-            return true;
-        }
-
-        String name = player.getName();
-        long now = System.currentTimeMillis();
-        boolean repeating = false;
-
-        // Check to see whether this event is being repeated
-        BlacklistTrackedEvent tracked = blacklist.lastAffected.get(name);
-        if (tracked != null) {
-            if (tracked.matches(event, now)) {
-                repeating = true;
-            }
-        } else {
-            blacklist.lastAffected.put(name, new BlacklistTrackedEvent(event, now));
-        }
-
-        String actions[] = getActions(event);
-
-
-        boolean ret = !useAsWhitelist;
-
-        // Nothing to do
-        if (actions == null) {
-            return ret;
-        }
-
-        for (String action : actions) {
-            // Deny
-            if (action.equalsIgnoreCase("deny")) {
-                if (silent) {
-                    return false;
-                }
-
-                ret = false;
-
-            // Allow
-            } else if (action.equalsIgnoreCase("allow")) {
-                if (silent) {
-                    return true;
-                }
-
-                ret = true;
-
-            // Kick
-            } else if (action.equalsIgnoreCase("kick")) {
-                if (silent) {
-                    continue;
-                }
-
-                if (this.message != null) {
-                    player.kick(String.format(this.message,
-                            getFriendlyItemName(event.getType())));
-                } else {
-                    player.kick("You can't " + event.getDescription() + " "
-                            + getFriendlyItemName(event.getType()));
-                }
-
-            // Ban
-            } else if (action.equalsIgnoreCase("ban")) {
-                if (silent) {
-                    continue;
-                }
-
-                if (this.message != null) {
-                    player.ban("Banned: " + String.format(this.message,
-                            getFriendlyItemName(event.getType())));
-                } else {
-                    player.ban("Banned: You can't "
-                            + event.getDescription() + " "
-                            + getFriendlyItemName(event.getType()));
-                }
-
-            } else if (!silent && (!repeating || forceRepeat)) {
-                // Notify
-                if (action.equalsIgnoreCase("notify")) {
-                    blacklist.notify(event, comment);
-
-                // Log
-                } else if (action.equalsIgnoreCase("log")) {
-                    blacklist.getLogger().logEvent(event, comment);
-
-                // Tell
-                } else if (action.equalsIgnoreCase("tell")) {
-                    if (this.message != null) {
-                        player.printRaw(ChatColor.YELLOW +
-                                String.format(message, getFriendlyItemName(event.getType()))
-                                + ".");
-                    } else {
-                        player.printRaw(ChatColor.YELLOW + "You're not allowed to "
-                                + event.getDescription() + " "
-                                + getFriendlyItemName(event.getType()) + ".");
-                    }
-                }
-            }
-        }
-
-        return ret;
-    }
-
-    /**
-     * Get an item's friendly name with its ID.
-     *
-     * @param id The id to get a name for
-     */
-    private static String getFriendlyItemName(int id) {
-        ItemType type = ItemType.fromID(id);
-        if (type != null) {
-            return type.getName() + " (#" + id + ")";
-        } else {
-            return "#" + id + "";
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/BlacklistTrackedEvent.java

@@ -1,48 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist;
-
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-
-/**
- *
- * @author sk89q
- */
-public class BlacklistTrackedEvent {
-    private BlacklistEvent event;
-    private long time;
-
-    /**
-     * Construct the object.
-     *
-     * @param event The event tracked
-     * @param time The time at which the event occurred
-     */
-    public BlacklistTrackedEvent(BlacklistEvent event, long time) {
-        this.event = event;
-        this.time = time;
-    }
-
-    public boolean matches(BlacklistEvent other, long now) {
-        return other.getType() == event.getType()
-                && time > now - 3000
-                && other.getClass() == event.getClass();
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/BlacklistEvent.java

@@ -1,85 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-/**
- * Represents a blacklist event.
- * 
- * @author sk89q
- */
-public abstract class BlacklistEvent {
-    private Vector pos;
-    private int type;
-    
-    /**
-     * Holds the player that triggered the event.
-     */
-    private LocalPlayer player;
-    
-    /**
-     * Construct the object.
-     * 
-     * @param player The player associated with this event
-     * @param pos The position the event occurred at
-     * @param type The type of item used
-     */
-    public BlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        this.player = player;
-        this.pos = pos;
-        this.type = type;
-    }
-    
-    /**
-     * Get the player.
-     *
-     * @return The player associated with this event
-     */
-    public LocalPlayer getPlayer() {
-        return player;
-    }
-    
-    /**
-     * Get the position.
-     * 
-     * @return The position of this event
-     */
-    public Vector getPosition() {
-        return pos;
-    }
-    
-    /**
-     * Get the item type.
-     * 
-     * @return The type associated with this event
-     */
-    public int getType() {
-        return type;
-    }
-    
-    /**
-     * Get a short description such as "break" or "destroy with."
-     * 
-     * @return The event description
-     */
-    public abstract String getDescription();
-}

src/main/java/com/sk89q/worldguard/blacklist/events/BlockBlacklistEvent.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public abstract class BlockBlacklistEvent extends BlacklistEvent {
-    public BlockBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/BlockBreakBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class BlockBreakBlacklistEvent extends BlockBlacklistEvent {
-    public BlockBreakBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "break";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/BlockInteractBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class BlockInteractBlacklistEvent extends BlockBlacklistEvent {
-    public BlockInteractBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "interact with";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/BlockPlaceBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class BlockPlaceBlacklistEvent extends BlockBlacklistEvent {
-    public BlockPlaceBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "place";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/DestroyWithBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class DestroyWithBlacklistEvent extends BlacklistEvent {
-    public DestroyWithBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "destroy with";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/ItemAcquireBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class ItemAcquireBlacklistEvent extends ItemBlacklistEvent {
-    public ItemAcquireBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "acquire";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/ItemBlacklistEvent.java

@@ -1,29 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public abstract class ItemBlacklistEvent extends BlacklistEvent {
-    public ItemBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/ItemDropBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class ItemDropBlacklistEvent extends ItemBlacklistEvent {
-    public ItemDropBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "drop";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/events/ItemUseBlacklistEvent.java

@@ -1,34 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.events;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class ItemUseBlacklistEvent extends ItemBlacklistEvent {
-    public ItemUseBlacklistEvent(LocalPlayer player, Vector pos, int type) {
-        super(player, pos, type);
-    }
-
-    @Override
-    public String getDescription() {
-        return "use";
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/loggers/BlacklistLoggerHandler.java

@@ -1,42 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.loggers;
-
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-
-/**
- * Interface for loggers for the blacklist.
- *
- * @author sk89q
- */
-public interface BlacklistLoggerHandler {
-    /**
-     * Log an event.
-     *
-     * @param event
-     * @param comment
-     */
-    public void logEvent(BlacklistEvent event, String comment);
-
-    /**
-     * Close the logger.
-     */
-    public void close();
-}

src/main/java/com/sk89q/worldguard/blacklist/loggers/ConsoleLoggerHandler.java

@@ -1,128 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.loggers;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-
-/**
- *
- * @author sk89q
- */
-public class ConsoleLoggerHandler implements BlacklistLoggerHandler {
-
-
-    private String worldName;
-	
-    private final Logger logger;
-
-    public ConsoleLoggerHandler(String worldName, Logger logger) {
-        this.worldName = worldName;
-	    this.logger = logger;
-    }
-
-    public void logEvent(BlacklistEvent event, String comment) {
-        // Block break
-        if (event instanceof BlockBreakBlacklistEvent) {
-            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to break " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Block place
-        } else if (event instanceof BlockPlaceBlacklistEvent) {
-            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to place " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Block interact
-        } else if (event instanceof BlockInteractBlacklistEvent) {
-            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to interact with " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Destroy with
-        } else if (event instanceof DestroyWithBlacklistEvent) {
-            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to destroy with " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Acquire
-        } else if (event instanceof ItemAcquireBlacklistEvent) {
-            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to acquire " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Drop
-        } else if (event instanceof ItemDropBlacklistEvent) {
-            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to drop " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Use
-        } else if (event instanceof ItemUseBlacklistEvent) {
-            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " tried to use " + getFriendlyItemName(evt.getType())
-                    + (comment != null ? " (" + comment + ")" : ""));
-
-        // Unknown
-        } else {
-            logger.log(Level.INFO, "[" + worldName + "] " + event.getPlayer().getName()
-                    + " caught unknown event: " + event.getClass().getCanonicalName());
-        }
-    }
-
-    /**
-     * Get an item's friendly name with its ID.
-     *
-     * @param id The item id
-     * @return The friendly name of the item
-     */
-    private static String getFriendlyItemName(int id) {
-        ItemType type = ItemType.fromID(id);
-        if (type != null) {
-            return type.getName() + " (#" + id + ")";
-        } else {
-            return "#" + id;
-        }
-    }
-
-    /**
-     * Close the connection.
-     */
-    public void close() {
-    }
-}

src/main/java/com/sk89q/worldguard/blacklist/loggers/DatabaseLoggerHandler.java

@@ -1,205 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.blacklist.loggers;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockInteractBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemAcquireBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemDropBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-
-/**
- *
- * @author sk89q
- */
-public class DatabaseLoggerHandler implements BlacklistLoggerHandler {
-
-    /**
-     * DSN.
-     */
-    private final String dsn;
-    /**
-     * Username.
-     */
-    private final String user;
-    /**
-     * Password.
-     */
-    private final String pass;
-    /**
-     * Table.
-     */
-    private final String table;
-    /**
-     * World name.
-     */
-    private final String worldName;
-    /**
-     * Database connection.
-     */
-    private Connection conn;
-    
-    private final Logger logger;
-
-    /**
-     * Construct the object.
-     *
-     * @param dsn The DSN for the connection
-     * @param user The username to connect with
-     * @param pass The password to connect with
-     * @param table The table to log to
-     * @param worldName The name of the world to log
-     * @param logger The logger to log errors to
-     */
-    public DatabaseLoggerHandler(String dsn, String user, String pass, String table, String worldName, Logger logger) {
-        this.dsn = dsn;
-        this.user = user;
-        this.pass = pass;
-        this.table = table;
-        this.worldName = worldName;
-        this.logger = logger;
-    }
-
-    /**
-     * Gets the database connection.
-     *
-     * @return The database connection
-     * @throws SQLException when the connection cannot be created
-     */
-    private Connection getConnection() throws SQLException {
-        if (conn == null || conn.isClosed()) {
-            conn = DriverManager.getConnection(dsn, user, pass);
-        }
-        return conn;
-    }
-
-    /**
-     * Log an event to the database.
-     *
-     * @param event The event to log
-     * @param player The player associated with the event
-     * @param pos The location of the event
-     * @param item The item used
-     * @param comment The comment associated with the event
-     */
-    private void logEvent(String event, LocalPlayer player, Vector pos, int item,
-            String comment) {
-        try {
-            Connection conn = getConnection();
-            PreparedStatement stmt = conn.prepareStatement(
-                    "INSERT INTO " + table
-                  + "(event, world, player, x, y, z, item, time, comment) VALUES "
-                  + "(?, ?, ?, ?, ?, ?, ?, ?, ?)");
-            stmt.setString(1, event);
-            stmt.setString(2, worldName);
-            stmt.setString(3, player.getName());
-            stmt.setInt(4, pos.getBlockX());
-            stmt.setInt(5, pos.getBlockY());
-            stmt.setInt(6, pos.getBlockZ());
-            stmt.setInt(7, item);
-            stmt.setInt(8, (int)(System.currentTimeMillis() / 1000));
-            stmt.setString(9, comment);
-            stmt.executeUpdate();
-        } catch (SQLException e) {
-            logger.log(Level.SEVERE, "Failed to log blacklist event to database: "
-                    + e.getMessage());
-        }
-    }
-
-    /**
-     * Log an event.
-     *
-     * @param event The event to log
-     */
-    public void logEvent(BlacklistEvent event, String comment) {
-        // Block break
-        if (event instanceof BlockBreakBlacklistEvent) {
-            BlockBreakBlacklistEvent evt = (BlockBreakBlacklistEvent)event;
-            logEvent("BREAK", evt.getPlayer(), evt.getPosition(),
-                    evt.getType(), comment);
-
-        // Block place
-        } else if (event instanceof BlockPlaceBlacklistEvent) {
-            BlockPlaceBlacklistEvent evt = (BlockPlaceBlacklistEvent)event;
-            logEvent("PLACE", evt.getPlayer(), evt.getPosition(),
-                    evt.getType(), comment);
-
-        // Block interact
-        } else if (event instanceof BlockInteractBlacklistEvent) {
-            BlockInteractBlacklistEvent evt = (BlockInteractBlacklistEvent)event;
-            logEvent("INTERACT", evt.getPlayer(), evt.getPosition(),
-                    evt.getType(), comment);
-
-        // Destroy with
-        } else if (event instanceof DestroyWithBlacklistEvent) {
-            DestroyWithBlacklistEvent evt = (DestroyWithBlacklistEvent)event;
-            logEvent("DESTROY_WITH", evt.getPlayer(), evt.getPosition(),
-                    evt.getType(), comment);
-
-        // Acquire
-        } else if (event instanceof ItemAcquireBlacklistEvent) {
-            ItemAcquireBlacklistEvent evt = (ItemAcquireBlacklistEvent)event;
-            logEvent("ACQUIRE", evt.getPlayer(), evt.getPlayer().getPosition(),
-                    evt.getType(), comment);
-
-        // Drop
-        } else if (event instanceof ItemDropBlacklistEvent) {
-            ItemDropBlacklistEvent evt = (ItemDropBlacklistEvent)event;
-            logEvent("DROP", evt.getPlayer(), evt.getPlayer().getPosition(),
-                    evt.getType(), comment);
-
-        // Use
-        } else if (event instanceof ItemUseBlacklistEvent) {
-            ItemUseBlacklistEvent evt = (ItemUseBlacklistEvent)event;
-            logEvent("USE", evt.getPlayer(), evt.getPlayer().getPosition(),
-                    evt.getType(), comment);
-
-        // Unknown
-        } else {
-            logEvent("UNKNOWN", event.getPlayer(), event.getPlayer().getPosition(),
-                    -1, comment);
-        }
-    }
-
-    /**
-     * Close the connection.
-     */
-    public void close() {
-        try {
-            if (conn != null && !conn.isClosed()) {
-                conn.close();
-            }
-        } catch (SQLException ignore) {
-
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/AbstractPermissionModel.java

@@ -1,46 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the 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
- * (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 <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.command.CommandSender;
-import org.enginehub.util.PermissionModel;
-
-abstract class AbstractPermissionModel implements PermissionModel {
-    
-    private final WorldGuardPlugin plugin;
-    private final CommandSender sender;
-
-    public AbstractPermissionModel(WorldGuardPlugin plugin, CommandSender sender) {
-        this.plugin = plugin;
-        this.sender = sender;
-    }
-    
-    protected WorldGuardPlugin getPlugin() {
-        return plugin;
-    }
-
-    public CommandSender getSender() {
-        return sender;
-    }
-
-    protected boolean hasPluginPermission(String permission) {
-        return plugin.hasPermission(getSender(), "worldguard." + permission);
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/BukkitBlacklist.java

@@ -1,36 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import com.sk89q.worldguard.blacklist.Blacklist;
-
-public class BukkitBlacklist extends Blacklist {
-    private WorldGuardPlugin plugin;
-    
-    public BukkitBlacklist(Boolean useAsWhitelist, WorldGuardPlugin plugin) {
-        super(useAsWhitelist, plugin.getLogger());
-        this.plugin = plugin;
-    }
-    
-    @Override
-    public void broadcastNotification(String msg) {
-        plugin.broadcastNotification(msg);
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/BukkitPlayer.java

@@ -1,78 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.Location;
-import org.bukkit.entity.Player;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-
-public class BukkitPlayer extends LocalPlayer {
-    private Player player;
-    private WorldGuardPlugin plugin;
-    
-    public BukkitPlayer(WorldGuardPlugin plugin, Player player) {
-        this.plugin = plugin;
-        this.player = player;
-    }
-
-    @Override
-    public String getName() {
-        return player.getName();
-    }
-
-    @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) {
-        player.kickPlayer(msg);
-    }
-
-    @Override
-    public void ban(String msg) {
-        player.setBanned(true);
-        player.kickPlayer(msg);
-    }
-
-    @Override
-    public String[] getGroups() {
-        return plugin.getGroups(player);
-    }
-
-    @Override
-    public void printRaw(String msg) {
-        player.sendMessage(msg);
-    }
-
-    @Override
-    public boolean hasPermission(String perm) {
-        return plugin.hasPermission(player, perm);
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/BukkitUtil.java

@@ -1,297 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-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 org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Tameable;
-import org.bukkit.entity.ExperienceOrb;
-import org.bukkit.entity.FallingBlock;
-import org.bukkit.entity.Item;
-import org.bukkit.entity.TNTPrimed;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import java.util.List;
-
-public class BukkitUtil {
-
-    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());
-    }
-
-    /**
-     * 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<Player> 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;
-    }
-
-    /**
-     * 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));
-    }
-
-    /**
-     * 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
-     */
-    public static <T extends Enum<T>> T tryEnum(Class<T> enumType, String ... values) {
-        for (String val : values) {
-            try {
-                return Enum.valueOf(enumType, val);
-            } catch (IllegalArgumentException e) {
-            }
-        }
-
-        return null;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/ConfigurationManager.java

@@ -1,312 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.bukkit;
-
-import com.sk89q.commandbook.CommandBook;
-import com.sk89q.commandbook.GodComponent;
-import com.sk89q.util.yaml.YAMLFormat;
-import com.sk89q.util.yaml.YAMLProcessor;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.Blacklist;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-/**
- * Represents the global configuration and also delegates configuration
- * for individual worlds.
- *
- * @author sk89q
- * @author Michael
- */
-public class ConfigurationManager {
-
-    private static final String CONFIG_HEADER = "#\r\n" +
-            "# WorldGuard's main configuration file\r\n" +
-            "#\r\n" +
-            "# This is the global configuration file. Anything placed into here will\r\n" +
-            "# be applied to all worlds. However, each world has its own configuration\r\n" +
-            "# file to allow you to replace most settings in here for that world only.\r\n" +
-            "#\r\n" +
-            "# About editing this file:\r\n" +
-            "# - DO NOT USE TABS. You MUST use spaces or Bukkit will complain. If\r\n" +
-            "#   you use an editor like Notepad++ (recommended for Windows users), you\r\n" +
-            "#   must configure it to \"replace tabs with spaces.\" In Notepad++, this can\r\n" +
-            "#   be changed in Settings > Preferences > Language Menu.\r\n" +
-            "# - Don't get rid of the indents. They are indented so some entries are\r\n" +
-            "#   in categories (like \"enforce-single-session\" is in the \"protection\"\r\n" +
-            "#   category.\r\n" +
-            "# - If you want to check the format of this file before putting it\r\n" +
-            "#   into WorldGuard, paste it into http://yaml-online-parser.appspot.com/\r\n" +
-            "#   and see if it gives \"ERROR:\".\r\n" +
-            "# - Lines starting with # are comments and so they are ignored.\r\n" +
-            "#\r\n";
-
-    /**
-     * Reference to the plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Holds configurations for different worlds.
-     */
-    private ConcurrentMap<String, WorldConfiguration> worlds;
-
-    /**
-     * The global configuration for use when loading worlds
-     */
-    private YAMLProcessor config;
-
-    /**
-     * List of people with god mode.
-     */
-    @Deprecated
-    private Set<String> hasGodMode = new HashSet<String>();
-
-    /**
-     * List of people who can breathe underwater.
-     */
-    private Set<String> hasAmphibious = new HashSet<String>();
-
-    private boolean hasCommandBookGodMode = false;
-
-    public boolean useRegionsScheduler;
-    public boolean useRegionsCreatureSpawnEvent;
-    public boolean activityHaltToggle = false;
-    public boolean autoGodMode;
-    public boolean usePlayerMove;
-    public boolean usePlayerTeleports;
-    public boolean deopOnJoin;
-    public boolean blockInGameOp;
-    public Map<String, String> hostKeys = new HashMap<String, String>();
-
-    /**
-     * Region Storage Configuration method, and config values
-     */
-    public boolean useSqlDatabase = false;
-    public String sqlDsn;
-    public String sqlUsername;
-    public String sqlPassword;
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin The plugin instance
-     */
-    public ConfigurationManager(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        this.worlds = new ConcurrentHashMap<String, WorldConfiguration>();
-    }
-
-    /**
-     * Load the configuration.
-     */
-    @SuppressWarnings("unchecked")
-    public void load() {
-        // Create the default configuration file
-        plugin.createDefaultConfiguration(
-                new File(plugin.getDataFolder(), "config.yml"), "config.yml");
-
-        config = new YAMLProcessor(new File(plugin.getDataFolder(), "config.yml"), true, YAMLFormat.EXTENDED);
-        try {
-            config.load();
-        } catch (IOException e) {
-            plugin.getLogger().severe("Error reading configuration for global config: ");
-            e.printStackTrace();
-        }
-
-        config.removeProperty("suppress-tick-sync-warnings");
-        useRegionsScheduler = config.getBoolean("regions.use-scheduler", true);
-        useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
-        autoGodMode = config.getBoolean("auto-invincible", config.getBoolean("auto-invincible-permission", false));
-        config.removeProperty("auto-invincible-permission");
-        usePlayerMove = config.getBoolean("use-player-move-event", true);
-        usePlayerTeleports = config.getBoolean("use-player-teleports", true);
-
-        deopOnJoin = config.getBoolean("security.deop-everyone-on-join", false);
-        blockInGameOp = config.getBoolean("security.block-in-game-op-command", false);
-
-        hostKeys = new HashMap<String, String>();
-        Object hostKeysRaw = config.getProperty("host-keys");
-        if (hostKeysRaw == null || !(hostKeysRaw instanceof Map)) {
-            config.setProperty("host-keys", new HashMap<String, String>());
-        } else {
-            for (Map.Entry<Object, Object> entry : ((Map<Object, Object>) hostKeysRaw).entrySet()) {
-                String key = String.valueOf(entry.getKey());
-                String value = String.valueOf(entry.getValue());
-                hostKeys.put(key.toLowerCase(), value);
-            }
-        }
-
-        useSqlDatabase = config.getBoolean(
-                "regions.sql.use", false);
-
-        sqlDsn = config.getString("regions.sql.dsn", "jdbc:mysql://localhost/worldguard");
-        sqlUsername = config.getString("regions.sql.username", "worldguard");
-        sqlPassword = config.getString("regions.sql.password", "worldguard");
-
-        // Load configurations for each world
-        for (World world : plugin.getServer().getWorlds()) {
-            get(world);
-        }
-
-        config.setHeader(CONFIG_HEADER);
-
-        if (!config.save()) {
-            plugin.getLogger().severe("Error saving configuration!");
-        }
-    }
-
-    /**
-     * Unload the configuration.
-     */
-    public void unload() {
-        worlds.clear();
-    }
-
-    /**
-     * Get the configuration for a world.
-     *
-     * @param world The world to get the configuration for
-     * @return {@code world}'s configuration
-     */
-    public WorldConfiguration get(World world) {
-        String worldName = world.getName();
-        WorldConfiguration config = worlds.get(worldName);
-        WorldConfiguration newConfig = null;
-
-        while (config == null) {
-            if (newConfig == null) {
-                newConfig = new WorldConfiguration(plugin, worldName, this.config);
-            }
-            worlds.putIfAbsent(world.getName(), newConfig);
-            config = worlds.get(world.getName());
-        }
-
-        return config;
-    }
-
-    /**
-     * Forget a player.
-     *
-     * @param player The player to forget about
-     */
-    public void forgetPlayer(LocalPlayer player) {
-        for (Map.Entry<String, WorldConfiguration> entry
-                : worlds.entrySet()) {
-
-            // The blacklist needs to forget players
-            Blacklist bl = entry.getValue().getBlacklist();
-            if (bl != null) {
-                bl.forgetPlayer(player);
-            }
-        }
-
-        hasGodMode.remove(player.getName());
-        hasAmphibious.remove(player.getName());
-    }
-
-    /**
-     * Enable god mode for a player.
-     *
-     * @param player The player to enable god mode for.
-     */
-    @Deprecated
-    public void enableGodMode(Player player) {
-
-        hasGodMode.add(player.getName());
-    }
-
-    /**
-     * Disable god mode for a player.
-     *
-     * @param player The player to disable godmode for
-     */
-    @Deprecated
-    public void disableGodMode(Player player) {
-        hasGodMode.remove(player.getName());
-    }
-
-    /**
-     * Check to see if god mode is enabled for a player.
-     *
-     * @param player The player to check
-     * @return Whether the player has godmode through WorldGuard or CommandBook
-     */
-    public boolean hasGodMode(Player player) {
-        if (hasCommandBookGodMode) {
-            GodComponent god = CommandBook.inst().getComponentManager().getComponent(GodComponent.class);
-            if (god != null) {
-                return god.hasGodMode(player);
-            }
-        }
-        return hasGodMode.contains(player.getName());
-    }
-
-    /**
-     * Enable amphibious mode for a player.
-     *
-     * @param player The player to enable amphibious mode for
-     */
-    public void enableAmphibiousMode(Player player) {
-        hasAmphibious.add(player.getName());
-    }
-
-    /**
-     * Disable amphibious mode  for a player.
-     *
-     * @param player The player to disable amphibious mode for
-     */
-    public void disableAmphibiousMode(Player player) {
-        hasAmphibious.remove(player.getName());
-    }
-
-    /**
-     * Check to see if amphibious mode is enabled for a player.
-     *
-     * @param player The player to check
-     * @return Whether {@code player} has amphibious mode
-     */
-    public boolean hasAmphibiousMode(Player player) {
-        return hasAmphibious.contains(player.getName());
-    }
-
-    public void updateCommandBookGodMode() {
-        try {
-            if (plugin.getServer().getPluginManager().isPluginEnabled("CommandBook")) {
-                Class.forName("com.sk89q.commandbook.GodComponent");
-                hasCommandBookGodMode = true;
-                return;
-            }
-        } catch (ClassNotFoundException ignore) {}
-        hasCommandBookGodMode = false;
-    }
-
-    public boolean hasCommandBookGodMode() {
-        return hasCommandBookGodMode;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/FlagStateManager.java

@@ -1,251 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.bukkit.GameMode;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-/**
- * This processes per-player state information and is also meant to be used
- * as a scheduled task.
- *
- * @author sk89q
- */
-public class FlagStateManager implements Runnable {
-
-    public static final int RUN_DELAY = 20;
-
-    private WorldGuardPlugin plugin;
-    private Map<String, PlayerFlagState> states;
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin The plugin instance
-     */
-    public FlagStateManager(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-
-        states = new HashMap<String, PlayerFlagState>();
-    }
-
-    /**
-     * Run the task.
-     */
-    @Override
-	public void run() {
-        Player[] players = plugin.getServer().getOnlinePlayers();
-        ConfigurationManager config = plugin.getGlobalStateManager();
-
-        for (Player player : players) {
-            WorldConfiguration worldConfig = config.get(player.getWorld());
-
-            if (!worldConfig.useRegions) {
-                continue;
-            }
-
-            PlayerFlagState state;
-
-            synchronized (this) {
-                state = states.get(player.getName());
-
-                if (state == null) {
-                    state = new PlayerFlagState();
-                    states.put(player.getName(), state);
-                }
-            }
-
-            Vector playerLocation = toVector(player.getLocation());
-            RegionManager regionManager = plugin.getGlobalRegionManager().get(player.getWorld());
-            ApplicableRegionSet applicable = regionManager.getApplicableRegions(playerLocation);
-
-            if (!RegionQueryUtil.isInvincible(plugin, player, applicable)
-                    && !plugin.getGlobalStateManager().hasGodMode(player)
-                    && !(player.getGameMode() == GameMode.CREATIVE)) {
-                processHeal(applicable, player, state);
-                processFeed(applicable, player, state);
-            }
-        }
-    }
-
-    /**
-     * Process healing for a player.
-     *
-     * @param applicable The set of applicable regions
-     * @param player The player to process healing flags on
-     * @param state The player's state
-     */
-    private void processHeal(ApplicableRegionSet applicable, Player player,
-            PlayerFlagState state) {
-
-        if (player.getHealth() <= 0) {
-            return;
-        }
-
-        long now = System.currentTimeMillis();
-
-        Integer healAmount = applicable.getFlag(DefaultFlag.HEAL_AMOUNT);
-        Integer healDelay = applicable.getFlag(DefaultFlag.HEAL_DELAY);
-        Double minHealth = applicable.getFlag(DefaultFlag.MIN_HEAL);
-        Double maxHealth = applicable.getFlag(DefaultFlag.MAX_HEAL);
-
-        if (healAmount == null || healDelay == null || healAmount == 0 || healDelay < 0) {
-            return;
-        }
-        if (minHealth == null) {
-			minHealth = 0.0;
-		}
-        if (maxHealth == null) {
-			maxHealth = player.getMaxHealth();
-		}
-
-        // Apply a cap to prevent possible exceptions
-        minHealth = Math.min(player.getMaxHealth(), minHealth);
-        maxHealth = Math.min(player.getMaxHealth(), maxHealth);
-
-        if (player.getHealth() >= maxHealth && healAmount > 0) {
-            return;
-        }
-
-        if (healDelay <= 0) {
-            player.setHealth(healAmount > 0 ? maxHealth : minHealth); // this will insta-kill if the flag is unset
-            state.lastHeal = now;
-        } else if (now - state.lastHeal > healDelay * 1000) {
-            // clamp health between minimum and maximum
-            player.setHealth(Math.min(maxHealth, Math.max(minHealth, player.getHealth() + healAmount)));
-            state.lastHeal = now;
-        }
-    }
-
-    /**
-     * Process restoring hunger for a player.
-     *
-     * @param applicable The set of applicable regions
-     * @param player The player to process hunger flags on
-     * @param state The player's state
-     */
-    private void processFeed(ApplicableRegionSet applicable, Player player,
-            PlayerFlagState state) {
-
-        long now = System.currentTimeMillis();
-
-        Integer feedAmount = applicable.getFlag(DefaultFlag.FEED_AMOUNT);
-        Integer feedDelay = applicable.getFlag(DefaultFlag.FEED_DELAY);
-        Integer minHunger = applicable.getFlag(DefaultFlag.MIN_FOOD);
-        Integer maxHunger = applicable.getFlag(DefaultFlag.MAX_FOOD);
-
-        if (feedAmount == null || feedDelay == null || feedAmount == 0 || feedDelay < 0) {
-            return;
-        }
-        if (minHunger == null) {
-			minHunger = 0;
-		}
-        if (maxHunger == null) {
-			maxHunger = 20;
-		}
-
-        // Apply a cap to prevent possible exceptions
-        minHunger = Math.min(20, minHunger);
-        maxHunger = Math.min(20, maxHunger);
-
-        if (player.getFoodLevel() >= maxHunger && feedAmount > 0) {
-            return;
-        }
-
-        if (feedDelay <= 0) {
-            player.setFoodLevel(feedAmount > 0 ? maxHunger : minHunger);
-            state.lastFeed = now;
-        } else if (now - state.lastFeed > feedDelay * 1000) {
-            // clamp health between minimum and maximum
-            player.setFoodLevel(Math.min(maxHunger, Math.max(minHunger, player.getFoodLevel() + feedAmount)));
-            state.lastFeed = now;
-        }
-    }
-
-    /**
-     * Forget a player.
-     *
-     * @param player The player to forget
-     */
-    public synchronized void forget(Player player) {
-        states.remove(player.getName());
-    }
-
-    /**
-     * Forget all managed players. Use with caution.
-     */
-    public synchronized void forgetAll() {
-        states.clear();
-    }
-
-    /**
-     * Get a player's flag state. A new state will be created if there is no existing
-     * state for the player.
-     *
-     * @param player The player to get a state for
-     * @return The {@code player}'s state
-     */
-    public synchronized PlayerFlagState getState(Player player) {
-        PlayerFlagState state = states.get(player.getName());
-
-        if (state == null) {
-            state = new PlayerFlagState();
-            states.put(player.getName(), state);
-        }
-
-        return state;
-    }
-
-    /**
-     * Keeps state per player.
-     */
-    public static class PlayerFlagState {
-        public long lastHeal;
-        public long lastFeed;
-        public String lastGreeting;
-        public String lastFarewell;
-        public Boolean lastExitAllowed = null;
-        public Boolean notifiedForLeave = false;
-        public Boolean notifiedForEnter = false;
-        public GameMode lastGameMode;
-        public World lastWorld;
-        public int lastBlockX;
-        public int lastBlockY;
-        public int lastBlockZ;
-
-        /* Used to cache invincibility status */
-        public World lastInvincibleWorld;
-        public int lastInvincibleX;
-        public int lastInvincibleY;
-        public int lastInvincibleZ;
-        public boolean wasInvincible;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/LegacyWorldGuardMigration.java

@@ -1,154 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import org.bukkit.World;
-
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.CSVDatabase;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-/**
- * Utility methods for porting from legacy versions.
- * 
- * @author sk89q
- */
-public class LegacyWorldGuardMigration {
-    
-    /**
-     * Port over the blacklist.
-     * 
-     * @param plugin The plugin instance
-     */
-    public static void migrateBlacklist(WorldGuardPlugin plugin) {
-        World mainWorld = plugin.getServer().getWorlds().get(0);
-        String mainWorldName = mainWorld.getName();
-        String newPath = "worlds/" + mainWorldName + "/blacklist.txt";
-        
-        File oldFile = new File(plugin.getDataFolder(), "blacklist.txt");
-        File newFile = new File(plugin.getDataFolder(), newPath);
-        
-        if (!newFile.exists() && oldFile.exists()) {
-            plugin.getLogger().warning("WorldGuard will now update your blacklist "
-                    + "from an older version of WorldGuard.");
-            
-            // Need to make root directories
-            newFile.getParentFile().mkdirs();
-            
-            if (copyFile(oldFile, newFile)) {
-                oldFile.renameTo(new File(plugin.getDataFolder(),
-                        "blacklist.txt.old"));
-            } else {
-                plugin.getLogger().warning("blacklist.txt has been converted " +
-                        "for the main world at " + newPath + "");
-                plugin.getLogger().warning("Your other worlds currently have no " +
-                		"blacklist defined!");
-            }
-            
-        }
-    }
-
-    /**
-     * Migrate region settings.
-     * 
-     * @param plugin The plugin instance
-     */
-    public static void migrateRegions(WorldGuardPlugin plugin) {
-        try {
-            File oldDatabase = new File(plugin.getDataFolder(), "regions.txt");
-            if (!oldDatabase.exists()) return;
-            
-            plugin.getLogger().info("The regions database has changed in 5.x. "
-                    + "Your old regions database will be converted to the new format "
-                    + "and set as your primary world's database.");
-
-            World w = plugin.getServer().getWorlds().get(0);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(w);
-
-            // First load up the old database using the CSV loader
-            CSVDatabase db = new CSVDatabase(oldDatabase, plugin.getLogger());
-            db.load();
-            
-            // Then save the new database
-            mgr.setRegions(db.getRegions());
-            mgr.save();
-            
-            oldDatabase.renameTo(new File(plugin.getDataFolder(), "regions.txt.old"));
-
-            plugin.getLogger().info("Regions database converted!");
-        } catch (ProtectionDatabaseException e) {
-            plugin.getLogger().warning("Failed to load regions: "
-                    + e.getMessage());
-        }
-    }
-
-    /**
-     * Copies a file.
-     * 
-     * @param from The source file
-     * @param to The destination file
-     * @return true if successful
-     */
-    private static boolean copyFile(File from, File to) {
-        InputStream in = null;
-        OutputStream out = null;
-        
-        try {
-            in = new FileInputStream(from);
-            out = new FileOutputStream(to);
-
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-            
-            in.close();
-            out.close();
-            
-            return true;
-        } catch (FileNotFoundException ignore) {
-        } catch (IOException ignore) {
-        } finally {
-            if (in != null) {
-                try {
-                    in.close();
-                } catch (IOException ignore) {
-                }
-            }
-            
-            if (out != null) {
-                try {
-                    out.close();
-                } catch (IOException ignore) {
-                }
-            }
-        }
-        
-        return false;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/LoggerToChatHandler.java

@@ -1,70 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import java.util.logging.Handler;
-import java.util.logging.LogRecord;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-/**
- * Sends all logger messages to a player.
- *
- * @author sk89q
- */
-public class LoggerToChatHandler extends Handler {
-    /**
-     * Player.
-     */
-    private CommandSender player;
-
-    /**
-     * Construct the object.
-     *
-     * @param player
-     */
-    public LoggerToChatHandler(CommandSender player) {
-        this.player = player;
-    }
-
-    /**
-     * Close the handler.
-     */
-    @Override
-    public void close() {
-    }
-
-    /**
-     * Flush the output.
-     */
-    @Override
-    public void flush() {
-    }
-
-    /**
-     * Publish a log record.
-     */
-    @Override
-    public void publish(LogRecord record) {
-        player.sendMessage(ChatColor.GRAY + record.getLevel().getName() + ": "
-                + ChatColor.WHITE + record.getMessage());
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/RegionQueryUtil.java

@@ -1,83 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class RegionQueryUtil {
-
-    public static boolean isInvincible(WorldGuardPlugin plugin, Player player) {
-        return isInvincible(plugin, player, null);
-    }
-
-    public static boolean isInvincible(WorldGuardPlugin plugin, Player player,
-                                       ApplicableRegionSet set) {
-        Location loc = player.getLocation();
-        World world = player.getWorld();
-        
-        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
-
-        if (state.lastInvincibleWorld == null ||
-                !state.lastInvincibleWorld.equals(world) ||
-                state.lastInvincibleX != loc.getBlockX() ||
-                state.lastInvincibleY != loc.getBlockY() ||
-                state.lastInvincibleZ != loc.getBlockZ()) {
-            state.lastInvincibleX = loc.getBlockX();
-            state.lastInvincibleY = loc.getBlockY();
-            state.lastInvincibleZ = loc.getBlockZ();
-            state.lastInvincibleWorld = world;
-
-            if (set == null) {
-                Vector vec = new Vector(state.lastInvincibleX,
-                        state.lastInvincibleY, state.lastInvincibleZ);
-                RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-                set = mgr.getApplicableRegions(vec);
-            }
-
-            state.wasInvincible = set.allows(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
-        }
-
-        return state.wasInvincible;
-    }
-
-    public static Boolean isAllowedInvinciblity(WorldGuardPlugin plugin, Player player) {
-        World world = player.getWorld();
-        FlagStateManager.PlayerFlagState state = plugin.getFlagStateManager().getState(player);
-        Vector vec = new Vector(state.lastInvincibleX, state.lastInvincibleY, state.lastInvincibleZ);
-
-        StateFlag.State regionState = plugin.getGlobalRegionManager().get(world).
-                getApplicableRegions(vec).getFlag(DefaultFlag.INVINCIBILITY, plugin.wrapPlayer(player));
-        if (regionState == StateFlag.State.ALLOW) {
-            return Boolean.TRUE;
-        } else if (regionState == StateFlag.State.DENY) {
-            return Boolean.FALSE;
-        } else {
-            return null;
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/ReportWriter.java

@@ -1,337 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.bukkit.Server;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.plugin.Plugin;
-
-import com.sk89q.worldguard.protection.GlobalRegionManager;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.util.LogListBlock;
-
-public class ReportWriter {
-
-    private static final SimpleDateFormat dateFmt =
-        new SimpleDateFormat("yyyy-MM-dd kk:mm Z");
-    
-    private Date date = new Date();
-    private StringBuilder output = new StringBuilder();
-    
-    public ReportWriter(WorldGuardPlugin plugin) {
-        appendReportHeader(plugin);
-        appendServerInformation(plugin.getServer());
-        appendPluginInformation(plugin.getServer().getPluginManager().getPlugins());
-        appendWorldInformation(plugin.getServer().getWorlds());
-        appendGlobalConfiguration(plugin.getGlobalStateManager());
-        appendWorldConfigurations(plugin, plugin.getServer().getWorlds(),
-                plugin.getGlobalRegionManager(), plugin.getGlobalStateManager());
-        appendln("-------------");
-        appendln("END OF REPORT");
-        appendln();
-    }
-    
-    protected static String repeat(String str, int n) {
-        if(str == null) {
-            return null;
-        }
-        
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < n; i++) {
-            sb.append(str);
-        }
-        
-        return sb.toString();
-    }
-    
-    protected void appendln(String text) {
-        output.append(text);
-        output.append("\r\n");
-    }
-    
-    protected void appendln(String text, Object ... args) {
-        output.append(String.format(text, args));
-        output.append("\r\n");
-    }
-    
-    protected void append(LogListBlock log) {
-        output.append(log.toString());
-    }
-    
-    protected void appendln() {
-        output.append("\r\n");
-    }
-    
-    protected void appendHeader(String text) {
-        String rule = repeat("-", text.length());
-        output.append(rule);
-        output.append("\r\n");
-        appendln(text);
-        output.append(rule);
-        output.append("\r\n");
-        appendln();
-    }
-    
-    private void appendReportHeader(WorldGuardPlugin plugin) {
-        appendln("WorldGuard Configuration Report");
-        appendln("Generated " + dateFmt.format(date));
-        appendln();
-        appendln("Version: " + plugin.getDescription().getVersion());
-        appendln();
-    }
-    
-    private void appendGlobalConfiguration(ConfigurationManager config) {
-        appendHeader("Global Configuration");
-        
-        LogListBlock log = new LogListBlock();
-        LogListBlock configLog = log.putChild("Configuration");
-        
-        Class<? extends ConfigurationManager> cls = config.getClass();
-        for (Field field : cls.getFields()) {
-            try {
-                if (field.getName().equalsIgnoreCase("CONFIG_HEADER")) continue;
-                Object val = field.get(config);
-                configLog.put(field.getName(), val);
-            } catch (IllegalArgumentException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException ignore) {
-            }
-        }
-        
-        append(log);
-        appendln();
-    }
-    
-    private void appendServerInformation(Server server) {
-        appendHeader("Server Information");
-        
-        LogListBlock log = new LogListBlock();
-        
-        Runtime runtime = Runtime.getRuntime();
-
-        log.put("Java", "%s %s (%s)",
-                System.getProperty("java.vendor"),
-                System.getProperty("java.version"),
-                System.getProperty("java.vendor.url"));
-        log.put("Operating system", "%s %s (%s)",
-                System.getProperty("os.name"),
-                System.getProperty("os.version"),
-                System.getProperty("os.arch"));
-        log.put("Available processors", runtime.availableProcessors());
-        log.put("Free memory", runtime.freeMemory() / 1024 / 1024 + " MB");
-        log.put("Max memory", runtime.maxMemory() / 1024 / 1024 + " MB");
-        log.put("Total memory", runtime.totalMemory() / 1024 / 1024 + " MB");
-        log.put("Server ID", server.getServerId());
-        log.put("Server name", server.getServerName());
-        log.put("Implementation", server.getVersion());
-        //log.put("Address", server.getIp(), server.getPort());
-        log.put("Player count", "%d/%d",
-                server.getOnlinePlayers().length, server.getMaxPlayers());
-
-        append(log);
-        appendln();
-    }
-    
-    private void appendPluginInformation(Plugin[] plugins) {
-        appendHeader("Plugins (" + plugins.length + ")");
-        
-        LogListBlock log = new LogListBlock();
-        
-        for (Plugin plugin : plugins) {
-            log.put(plugin.getDescription().getName(), plugin.getDescription().getVersion());
-        }
-
-        append(log);
-        appendln();
-        
-        /*appendHeader("Plugin Information");
-        
-        log = new LogListBlock();
-        
-        for (Plugin plugin : plugins) {
-            log.putChild(plugin.getDescription().getName())
-                .put("Data folder", plugin.getDataFolder())
-                .put("Website", plugin.getDescription().getWebsite())
-                .put("Entry point", plugin.getDescription().getMain());
-        }
-
-        append(log);
-        appendln();*/
-    }
-    
-    private void appendWorldInformation(List<World> worlds) {
-        appendHeader("Worlds");
-        
-        LogListBlock log = new LogListBlock();
-        
-        int i = 0;
-        for (World world : worlds) {
-            int loadedChunkCount = world.getLoadedChunks().length;
-            
-            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
-            LogListBlock infoLog = worldLog.putChild("Information");
-            LogListBlock entitiesLog = worldLog.putChild("Entities");
-            
-            infoLog.put("Seed", world.getSeed());
-            infoLog.put("Environment", world.getEnvironment().toString());
-            infoLog.put("Player count", world.getPlayers().size());
-            infoLog.put("Entity count", world.getEntities().size());
-            infoLog.put("Loaded chunk count", loadedChunkCount);
-            infoLog.put("Spawn location", world.getSpawnLocation());
-            infoLog.put("Raw time", world.getFullTime());
-            
-            Map<Class<? extends Entity>, Integer> entityCounts =
-                    new HashMap<Class<? extends Entity>, Integer>();
-            
-            // Collect entities
-            for (Entity entity : world.getEntities()) {
-                Class<? extends Entity> cls = entity.getClass();
-                
-                if (entityCounts.containsKey(cls)) {
-                    entityCounts.put(cls, entityCounts.get(cls) + 1);
-                } else {
-                    entityCounts.put(cls, 1);
-                }
-            }
-            
-            // Print entities
-            for (Map.Entry<Class<? extends Entity>, Integer> entry
-                    : entityCounts.entrySet()) {
-                entitiesLog.put(entry.getKey().getSimpleName(),
-                        "%d [%f/chunk]",
-                        entry.getValue(),
-                        (float) (entry.getValue() / (double) loadedChunkCount));
-            }
-            
-            i++;
-        }
-
-        append(log);
-        appendln();
-    }
-    
-    private void appendWorldConfigurations(WorldGuardPlugin plugin, List<World> worlds,
-            GlobalRegionManager regionMgr, ConfigurationManager mgr) {
-        appendHeader("World Configurations");
-        
-        LogListBlock log = new LogListBlock();
-
-        int i = 0;
-        for (World world : worlds) {
-            LogListBlock worldLog = log.putChild(world.getName() + " (" +  i + ")");
-            LogListBlock infoLog = worldLog.putChild("Information");
-            LogListBlock configLog = worldLog.putChild("Configuration");
-            LogListBlock blacklistLog = worldLog.putChild("Blacklist");
-            LogListBlock regionsLog = worldLog.putChild("Region manager");
-
-            infoLog.put("Configuration file", (new File(plugin.getDataFolder(), "worlds/"
-                    + world.getName() + "/config.yml")).getAbsoluteFile());
-
-            infoLog.put("Blacklist file", (new File(plugin.getDataFolder(), "worlds/"
-                    + world.getName() + "/blacklist.txt")).getAbsoluteFile());
-            infoLog.put("Regions file", (new File(plugin.getDataFolder(), "worlds/"
-                    + world.getName() + "/regions.yml")).getAbsoluteFile());
-            
-            WorldConfiguration config = mgr.get(world);
-            
-            Class<? extends WorldConfiguration> cls = config.getClass();
-            for (Field field : cls.getFields()) {
-                try {
-                    Object val = field.get(config);
-                    configLog.put(field.getName(), String.valueOf(val));
-                } catch (IllegalArgumentException e) {
-                    e.printStackTrace();
-                } catch (IllegalAccessException ignore) {
-                }
-            }
-            
-            if (config.getBlacklist() == null) {
-                blacklistLog.put("State", "DISABLED");
-            } else {
-                blacklistLog.put("State", "Enabled");
-                blacklistLog.put("Number of items",
-                        config.getBlacklist().getItemCount());
-                blacklistLog.put("Is whitelist",
-                        config.getBlacklist().isWhitelist());
-            }
-
-            RegionManager worldRegions = regionMgr.get(world);
-
-            regionsLog.put("Type", worldRegions.getClass().getCanonicalName());
-            regionsLog.put("Number of regions", worldRegions.getRegions().size());
-            LogListBlock globalRegionLog = regionsLog.putChild("Global region");
-            
-            ProtectedRegion globalRegion = worldRegions.getRegion("__global__");
-            if (globalRegion == null) {
-                globalRegionLog.put("Status", "UNDEFINED");
-            } else {
-                for (Flag<?> flag : DefaultFlag.getFlags()) {
-                    if (flag instanceof StateFlag) {
-                        globalRegionLog.put(flag.getName(),
-                                globalRegion.getFlag(flag));
-                    }
-                }
-            }
-        }
-
-        append(log);
-        appendln();
-    }
-    
-    public void write(File file) throws IOException {
-        FileWriter writer = null;
-        BufferedWriter out;
-        
-        try {
-            writer = new FileWriter(file);
-            out = new BufferedWriter(writer);
-            out.write(output.toString());
-            out.close();
-        } finally {
-            if (writer != null) {
-                try {
-                    writer.close();
-                } catch (IOException ignore) {
-                }
-            }
-        }
-    }
-    
-    @Override
-    public String toString() {
-        return output.toString();
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/SpongeUtil.java

@@ -1,126 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.isBlockWater;
-import static com.sk89q.worldguard.bukkit.BukkitUtil.setBlockToWater;
-
-import org.bukkit.World;
-
-public class SpongeUtil {
-
-    /**
-     * Remove water around a sponge.
-     *
-     * @param plugin The plugin instace
-     * @param world The world the sponge isin
-     * @param ox The x coordinate of the 'sponge' block
-     * @param oy The y coordinate of the 'sponge' block
-     * @param oz The z coordinate of the 'sponge' block
-     */
-    public static void clearSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
-            for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
-                for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
-                    if (isBlockWater(world, ox + cx, oy + cy, oz + cz)) {
-                        world.getBlockAt(ox + cx, oy + cy, oz + cz).setTypeId(0);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Add water around a sponge.
-     * 
-     * @param plugin The plugin instance
-     * @param world The world the sponge is located in
-     * @param ox The x coordinate of the 'sponge' block
-     * @param oy The y coordinate of the 'sponge' block
-     * @param oz The z coordinate of the 'sponge' block
-     */
-    public static void addSpongeWater(WorldGuardPlugin plugin, World world, int ox, int oy, int oz) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        // The negative x edge
-        int cx = ox - wcfg.spongeRadius - 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx + 1, cy, cz);
-                }
-            }
-        }
-
-        // The positive x edge
-        cx = ox + wcfg.spongeRadius + 1;
-        for (int cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx - 1, cy, cz);
-                }
-            }
-        }
-
-        // The negative y edge
-        int cy = oy - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy + 1, cz);
-                }
-            }
-        }
-
-        // The positive y edge
-        cy = oy + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (int cz = oz - wcfg.spongeRadius - 1; cz <= oz + wcfg.spongeRadius + 1; cz++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy - 1, cz);
-                }
-            }
-        }
-
-        // The negative z edge
-        int cz = oz - wcfg.spongeRadius - 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz + 1);
-                }
-            }
-        }
-
-        // The positive z edge
-        cz = oz + wcfg.spongeRadius + 1;
-        for (cx = ox - wcfg.spongeRadius - 1; cx <= ox + wcfg.spongeRadius + 1; cx++) {
-            for (cy = oy - wcfg.spongeRadius - 1; cy <= oy + wcfg.spongeRadius + 1; cy++) {
-                if (isBlockWater(world, cx, cy, cz)) {
-                    setBlockToWater(world, cx, cy, cz - 1);
-                }
-            }
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WGBukkit.java

@@ -1,70 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the 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
- * (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
- * GNU 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 <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.World;
-
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-/**
- * Helper class to get a reference to WorldGuard and its components.
- */
-public class WGBukkit {
-
-    private WGBukkit() {
-    }
-
-    /**
-     * Get the WorldGuard plugin. If WorldGuard isn't loaded yet, then this will
-     * return null.
-     * <p>
-     * If you are depending on WorldGuard in your plugin, you should place
-     * <code>softdepend: [WorldGuard]</code> or <code>depend: [WorldGuard]</code>
-     * in your plugin.yml so that this won't return null for you.
-     *
-     * @return the WorldGuard plugin or null
-     */
-    public static WorldGuardPlugin getPlugin() {
-        return WorldGuardPlugin.inst();
-    }
-
-    /**
-     * Set cache to null for reload WorldGuardPlugin
-     * @deprecated instance is now stored directly in {@link WorldGuardPlugin}
-     */
-    @Deprecated
-    public static void cleanCache() {
-        // do nothing - plugin instance is stored in plugin class now
-    }
-
-    /**
-     * Returns the region manager for a given world. May return null if WorldGuard
-     * is not loaded or region protection is not enabled for the given world.
-     *
-     * @param world world
-     * @return a region manager or null
-     */
-    public static RegionManager getRegionManager(World world) {
-        if (getPlugin() == null) {
-            return null;
-        }
-        return WorldGuardPlugin.inst().getRegionManager(world);
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardBlockListener.java

@@ -1,924 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Snowman;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.block.BlockBreakEvent;
-import org.bukkit.event.block.BlockBurnEvent;
-import org.bukkit.event.block.BlockDamageEvent;
-import org.bukkit.event.block.BlockDispenseEvent;
-import org.bukkit.event.block.BlockExpEvent;
-import org.bukkit.event.block.BlockFadeEvent;
-import org.bukkit.event.block.BlockFormEvent;
-import org.bukkit.event.block.BlockFromToEvent;
-import org.bukkit.event.block.BlockIgniteEvent;
-import org.bukkit.event.block.BlockIgniteEvent.IgniteCause;
-import org.bukkit.event.block.BlockPhysicsEvent;
-import org.bukkit.event.block.BlockPistonExtendEvent;
-import org.bukkit.event.block.BlockPistonRetractEvent;
-import org.bukkit.event.block.BlockPlaceEvent;
-import org.bukkit.event.block.BlockRedstoneEvent;
-import org.bukkit.event.block.BlockSpreadEvent;
-import org.bukkit.event.block.EntityBlockFormEvent;
-import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.SignChangeEvent;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.potion.Potion;
-import org.bukkit.potion.PotionEffect;
-
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldedit.blocks.BlockID;
-import com.sk89q.worldedit.blocks.BlockType;
-import com.sk89q.worldedit.blocks.ItemType;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.BlockPlaceBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.DestroyWithBlacklistEvent;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-/**
- * The listener for block events.
- *
- * @author sk89q
- */
-public class WorldGuardBlockListener implements Listener {
-
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin The plugin instance
-     */
-    public WorldGuardBlockListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Register events.
-     */
-    public void registerEvents() {
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-
-    /**
-     * Get the world configuration given a world.
-     *
-     * @param world The world to get the configuration for.
-     * @return The configuration for {@code world}
-     */
-    protected WorldConfiguration getWorldConfig(World world) {
-        return plugin.getGlobalStateManager().get(world);
-    }
-
-    /**
-     * Get the world configuration given a player.
-     *
-     * @param player The player to get the wold from
-     * @return The {@link WorldConfiguration} for the player's world
-     */
-    protected WorldConfiguration getWorldConfig(Player player) {
-        return getWorldConfig(player.getWorld());
-    }
-
-    /*
-     * Called when a block is damaged.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockDamage(BlockDamageEvent event) {
-        Player player = event.getPlayer();
-        Block blockDamaged = event.getBlock();
-
-        // Cake are damaged and not broken when they are eaten, so we must
-        // handle them a bit separately
-        if (blockDamaged.getTypeId() == BlockID.CAKE_BLOCK) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, blockDamaged)) {
-                player.sendMessage(ChatColor.DARK_RED + "You're not invited to this tea party!");
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a block is broken.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockBreak(BlockBreakEvent event) {
-        Player player = event.getPlayer();
-        WorldConfiguration wcfg = getWorldConfig(player);
-
-        if (!wcfg.itemDurability) {
-            ItemStack held = player.getItemInHand();
-            if (held.getTypeId() > 0
-                    && !(ItemType.usesDamageValue(held.getTypeId())
-                    || BlockType.usesData(held.getTypeId()))) {
-                held.setDurability((short) 0);
-                player.setItemInHand(held);
-            }
-        }
-
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())
-         || !plugin.getGlobalRegionManager().canConstruct(player, event.getBlock())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(event.getBlock()),
-                    event.getBlock().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (!wcfg.getBlacklist().check(
-                    new DestroyWithBlacklistEvent(plugin.wrapPlayer(player),
-                    toVector(event.getBlock()),
-                    player.getItemInHand().getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.isChestProtected(event.getBlock(), player)) {
-            player.sendMessage(ChatColor.DARK_RED + "The chest is protected.");
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    /*
-     * Called when fluids flow.
-     */
-    @EventHandler(ignoreCancelled = true)
-    public void onBlockFromTo(BlockFromToEvent event) {
-        World world = event.getBlock().getWorld();
-        Block blockFrom = event.getBlock();
-        Block blockTo = event.getToBlock();
-
-        boolean isWater = blockFrom.getTypeId() == 8 || blockFrom.getTypeId() == 9;
-        boolean isLava = blockFrom.getTypeId() == 10 || blockFrom.getTypeId() == 11;
-        boolean isAir = blockFrom.getTypeId() == 0;
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.simulateSponge && isWater) {
-            int ox = blockTo.getX();
-            int oy = blockTo.getY();
-            int oz = blockTo.getZ();
-
-            for (int cx = -wcfg.spongeRadius; cx <= wcfg.spongeRadius; cx++) {
-                for (int cy = -wcfg.spongeRadius; cy <= wcfg.spongeRadius; cy++) {
-                    for (int cz = -wcfg.spongeRadius; cz <= wcfg.spongeRadius; cz++) {
-                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                        if (sponge.getTypeId() == 19
-                                && (!wcfg.redstoneSponges || !sponge.isBlockIndirectlyPowered())) {
-                            event.setCancelled(true);
-                            return;
-                        }
-                    }
-                }
-            }
-        }
-
-        /*if (plugin.classicWater && isWater) {
-        int blockBelow = blockFrom.getRelative(0, -1, 0).getTypeId();
-        if (blockBelow != 0 && blockBelow != 8 && blockBelow != 9) {
-        blockFrom.setTypeId(9);
-        if (blockTo.getTypeId() == 0) {
-        blockTo.setTypeId(9);
-        }
-        return;
-        }
-        }*/
-
-        // Check the fluid block (from) whether it is air.
-        // If so and the target block is protected, cancel the event
-        if (wcfg.preventWaterDamage.size() > 0) {
-            int targetId = blockTo.getTypeId();
-
-            if ((isAir || isWater) &&
-                    wcfg.preventWaterDamage.contains(targetId)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.allowedLavaSpreadOver.size() > 0 && isLava) {
-            int targetId = blockTo.getRelative(0, -1, 0).getTypeId();
-
-            if (!wcfg.allowedLavaSpreadOver.contains(targetId)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.highFreqFlags && isWater
-                && !plugin.getGlobalRegionManager().allows(DefaultFlag.WATER_FLOW,
-                blockFrom.getLocation())) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.highFreqFlags && isLava
-                && !plugin.getGlobalRegionManager().allows(DefaultFlag.LAVA_FLOW,
-                blockFrom.getLocation())) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableObsidianGenerators && (isAir || isLava)
-                && blockTo.getTypeId() == 55) {
-            blockTo.setTypeId(0);
-            return;
-        }
-    }
-
-    /*
-     * Called when a block gets ignited.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockIgnite(BlockIgniteEvent event) {
-        IgniteCause cause = event.getCause();
-        Block block = event.getBlock();
-        World world = block.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-        boolean isFireSpread = cause == IgniteCause.SPREAD;
-
-        if (wcfg.preventLightningFire && cause == IgniteCause.LIGHTNING) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.preventLavaFire && cause == IgniteCause.LAVA) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpread && isFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.blockLighter && (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL)
-                && event.getPlayer() != null
-                && !plugin.hasPermission(event.getPlayer(), "worldguard.override.lighter")) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.fireSpreadDisableToggle && isFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpreadBlocks.size() > 0 && isFireSpread) {
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-
-            if (wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y - 1, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x + 1, y, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x - 1, y, z))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z - 1))
-                    || wcfg.disableFireSpreadBlocks.contains(world.getBlockTypeIdAt(x, y, z + 1))) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(block);
-            Player player = event.getPlayer();
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (player != null && !plugin.getGlobalRegionManager().hasBypass(player, world)) {
-                LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-                // this is preliminarily handled in the player listener under handleBlockRightClick
-                // why it's handled here too, no one knows
-                if (cause == IgniteCause.FLINT_AND_STEEL || cause == IgniteCause.FIREBALL) {
-                    if (!set.allows(DefaultFlag.LIGHTER)
-                            && !set.canBuild(localPlayer)
-                            && !plugin.hasPermission(player, "worldguard.override.lighter")) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-
-            if (wcfg.highFreqFlags && isFireSpread
-                    && !set.allows(DefaultFlag.FIRE_SPREAD)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.highFreqFlags && cause == IgniteCause.LAVA
-                    && !set.allows(DefaultFlag.LAVA_FIRE)) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (cause == IgniteCause.FIREBALL && event.getPlayer() == null) {
-                // wtf bukkit, FIREBALL is supposed to be reserved to players
-                if (!set.allows(DefaultFlag.GHAST_FIREBALL)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-
-            if (cause == IgniteCause.LIGHTNING && !set.allows(DefaultFlag.LIGHTNING)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a block is destroyed from burning.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockBurn(BlockBurnEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableFireSpread) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.fireSpreadDisableToggle) {
-            Block block = event.getBlock();
-            event.setCancelled(true);
-            checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
-            return;
-        }
-
-        if (wcfg.disableFireSpreadBlocks.size() > 0) {
-            Block block = event.getBlock();
-
-            if (wcfg.disableFireSpreadBlocks.contains(block.getTypeId())) {
-                event.setCancelled(true);
-                checkAndDestroyAround(block.getWorld(), block.getX(), block.getY(), block.getZ(), BlockID.FIRE);
-                return;
-            }
-        }
-
-        if (wcfg.isChestProtected(event.getBlock())) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.useRegions) {
-            Block block = event.getBlock();
-            int x = block.getX();
-            int y = block.getY();
-            int z = block.getZ();
-            Vector pt = toVector(block);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(block.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (!set.allows(DefaultFlag.FIRE_SPREAD)) {
-                checkAndDestroyAround(block.getWorld(), x, y, z, BlockID.FIRE);
-                event.setCancelled(true);
-                return;
-            }
-
-        }
-    }
-
-    private void checkAndDestroyAround(World world, int x, int y, int z, int required) {
-        checkAndDestroy(world, x, y, z + 1, required);
-        checkAndDestroy(world, x, y, z - 1, required);
-        checkAndDestroy(world, x, y + 1, z, required);
-        checkAndDestroy(world, x, y - 1, z, required);
-        checkAndDestroy(world, x + 1, y, z, required);
-        checkAndDestroy(world, x - 1, y, z, required);
-    }
-
-    private void checkAndDestroy(World world, int x, int y, int z, int required) {
-        if (world.getBlockTypeIdAt(x, y, z) == required) {
-            world.getBlockAt(x, y, z).setTypeId(BlockID.AIR);
-        }
-    }
-
-    /*
-     * Called when block physics occurs.
-     */
-    @EventHandler(ignoreCancelled = true)
-    public void onBlockPhysics(BlockPhysicsEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        int id = event.getChangedTypeId();
-
-        if (id == 13 && wcfg.noPhysicsGravel) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (id == 12 && wcfg.noPhysicsSand) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (id == 90 && wcfg.allowPortalAnywhere) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.ropeLadders && event.getBlock().getType() == Material.LADDER) {
-            if (event.getBlock().getRelative(0, 1, 0).getType() == Material.LADDER) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a player places a block.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockPlace(BlockPlaceEvent event) {
-        Block blockPlaced = event.getBlock();
-        Player player = event.getPlayer();
-        World world = blockPlaced.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.useRegions) {
-            final Location location = blockPlaced.getLocation();
-            if (!plugin.getGlobalRegionManager().canBuild(player, location)
-             || !plugin.getGlobalRegionManager().canConstruct(player, location)) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.getBlacklist() != null) {
-            if (!wcfg.getBlacklist().check(
-                    new BlockPlaceBlacklistEvent(plugin.wrapPlayer(player), toVector(blockPlaced),
-                    blockPlaced.getTypeId()), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.signChestProtection && wcfg.getChestProtection().isChest(blockPlaced.getTypeId())) {
-            if (wcfg.isAdjacentChestProtected(event.getBlock(), player)) {
-                player.sendMessage(ChatColor.DARK_RED + "This spot is for a chest that you don't have permission for.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.simulateSponge && blockPlaced.getTypeId() == 19) {
-            if (wcfg.redstoneSponges && blockPlaced.isBlockIndirectlyPowered()) {
-                return;
-            }
-
-            int ox = blockPlaced.getX();
-            int oy = blockPlaced.getY();
-            int oz = blockPlaced.getZ();
-
-            SpongeUtil.clearSpongeWater(plugin, world, ox, oy, oz);
-        }
-    }
-
-    /*
-     * Called when redstone changes.
-     */
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onBlockRedstoneChange(BlockRedstoneEvent event) {
-        Block blockTo = event.getBlock();
-        World world = blockTo.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.simulateSponge && wcfg.redstoneSponges) {
-            int ox = blockTo.getX();
-            int oy = blockTo.getY();
-            int oz = blockTo.getZ();
-
-            for (int cx = -1; cx <= 1; cx++) {
-                for (int cy = -1; cy <= 1; cy++) {
-                    for (int cz = -1; cz <= 1; cz++) {
-                        Block sponge = world.getBlockAt(ox + cx, oy + cy, oz + cz);
-                        if (sponge.getTypeId() == 19
-                                && sponge.isBlockIndirectlyPowered()) {
-                            SpongeUtil.clearSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
-                        } else if (sponge.getTypeId() == 19
-                                && !sponge.isBlockIndirectlyPowered()) {
-                            SpongeUtil.addSpongeWater(plugin, world, ox + cx, oy + cy, oz + cz);
-                        }
-                    }
-                }
-            }
-
-            return;
-        }
-    }
-
-    /*
-     * Called when a sign is changed.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onSignChange(SignChangeEvent event) {
-        Player player = event.getPlayer();
-        WorldConfiguration wcfg = getWorldConfig(player);
-
-        if (wcfg.signChestProtection) {
-            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
-                if (wcfg.isChestProtectedPlacement(event.getBlock(), player)) {
-                    player.sendMessage(ChatColor.DARK_RED + "You do not own the adjacent chest.");
-                    event.getBlock().breakNaturally();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (event.getBlock().getTypeId() != BlockID.SIGN_POST) {
-                    player.sendMessage(ChatColor.RED
-                            + "The [Lock] sign must be a sign post, not a wall sign.");
-
-                    event.getBlock().breakNaturally();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                if (!event.getLine(1).equalsIgnoreCase(player.getName())) {
-                    player.sendMessage(ChatColor.RED
-                            + "The first owner line must be your name.");
-
-                    event.getBlock().breakNaturally();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                int below = event.getBlock().getRelative(0, -1, 0).getTypeId();
-
-                if (below == BlockID.TNT || below == BlockID.SAND
-                        || below == BlockID.GRAVEL || below == BlockID.SIGN_POST) {
-                    player.sendMessage(ChatColor.RED
-                            + "That is not a safe block that you're putting this sign on.");
-
-                    event.getBlock().breakNaturally();
-                    event.setCancelled(true);
-                    return;
-                }
-
-                event.setLine(0, "[Lock]");
-                player.sendMessage(ChatColor.YELLOW
-                        + "A chest or double chest above is now protected.");
-            }
-        } else if (!wcfg.disableSignChestProtectionCheck) {
-            if (event.getLine(0).equalsIgnoreCase("[Lock]")) {
-                player.sendMessage(ChatColor.RED
-                        + "WorldGuard's sign chest protection is disabled.");
-
-                event.getBlock().breakNaturally();
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (!plugin.getGlobalRegionManager().canBuild(player, event.getBlock())) {
-            player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-            event.setCancelled(true);
-            return;
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onLeavesDecay(LeavesDecayEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.disableLeafDecay) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.LEAF_DECAY,
-                    event.getBlock().getLocation())) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    /*
-     * Called when a block is formed based on world conditions.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockForm(BlockFormEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        int type = event.getNewState().getTypeId();
-
-        if (event instanceof EntityBlockFormEvent) {
-            if (((EntityBlockFormEvent) event).getEntity() instanceof Snowman) {
-                if (wcfg.disableSnowmanTrails) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            return;
-        }
-
-        if (type == BlockID.ICE) {
-            if (wcfg.disableIceFormation) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.ICE_FORM, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (type == BlockID.SNOW) {
-            if (wcfg.disableSnowFormation) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.allowedSnowFallOver.size() > 0) {
-                int targetId = event.getBlock().getRelative(0, -1, 0).getTypeId();
-
-                if (!wcfg.allowedSnowFallOver.contains(targetId)) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.SNOW_FALL, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a block spreads based on world conditions.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockSpread(BlockSpreadEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (cfg.activityHaltToggle) {
-            event.setCancelled(true);
-            return;
-        }
-
-        int fromType = event.getSource().getTypeId();
-
-        if (fromType == BlockID.RED_MUSHROOM || fromType == BlockID.BROWN_MUSHROOM) {
-            if (wcfg.disableMushroomSpread) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.MUSHROOMS, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (fromType == BlockID.GRASS) {
-            if (wcfg.disableGrassGrowth) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.GRASS_SPREAD, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (fromType == BlockID.MYCELIUM) {
-            if (wcfg.disableMyceliumSpread) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions
-                    && !plugin.getGlobalRegionManager().allows(
-                            DefaultFlag.MYCELIUM_SPREAD, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (fromType == BlockID.VINE) {
-            if (wcfg.disableVineGrowth) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions
-                    && !plugin.getGlobalRegionManager().allows(
-                            DefaultFlag.VINE_GROWTH, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a block fades.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockFade(BlockFadeEvent event) {
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        switch (event.getBlock().getTypeId()) {
-        case BlockID.ICE:
-            if (wcfg.disableIceMelting) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.ICE_MELT, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-            break;
-
-        case BlockID.SNOW:
-            if (wcfg.disableSnowMelting) {
-                event.setCancelled(true);
-                return;
-            }
-
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.SNOW_MELT, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-            break;
-
-        case BlockID.SOIL:
-            if (wcfg.disableSoilDehydration) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(
-                    DefaultFlag.SOIL_DRY, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-            break;
-        }
-
-    }
-
-    /*
-     * Called when a piston extends
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation())) {
-                event.setCancelled(true);
-                return;
-            }
-            for (Block block : event.getBlocks()) {
-                if (!plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, block.getLocation())) {
-                    event.setCancelled(true);
-                    return;
-                }
-            }
-        }
-    }
-
-    /*
-     * Called when a piston retracts
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockPistonRetract(BlockPistonRetractEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.useRegions && event.isSticky()) {
-            if (!(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getRetractLocation()))
-                    || !(plugin.getGlobalRegionManager().allows(DefaultFlag.PISTONS, event.getBlock().getLocation()))) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    /*
-     * Called when a block is damaged.
-     */
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onBlockDispense(BlockDispenseEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-
-        if (wcfg.blockPotions.size() > 0) {
-            ItemStack item = event.getItem();
-            if (item.getType() == Material.POTION && !BukkitUtil.isWaterPotion(item)) {
-                Potion potion = Potion.fromDamage(BukkitUtil.getPotionEffectBits(item));
-                for (PotionEffect effect : potion.getEffects()) {
-                    if (potion.isSplash() && wcfg.blockPotions.contains(effect.getType())) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            }
-        }
-    }
-
-    /*
-     * Called when a block yields exp
-     */
-    @EventHandler(priority = EventPriority.HIGH)
-    public void onBlockExp(BlockExpEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getBlock().getWorld());
-        if (wcfg.disableExpDrops || !plugin.getGlobalRegionManager().allows(DefaultFlag.EXP_DROPS,
-                event.getBlock().getLocation())) {
-            event.setExpToDrop(0);
-        }
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardHangingListener.java

@@ -1,216 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Creeper;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Hanging;
-import org.bukkit.entity.ItemFrame;
-import org.bukkit.entity.LivingEntity;
-import org.bukkit.entity.Painting;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Projectile;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.hanging.HangingBreakByEntityEvent;
-import org.bukkit.event.hanging.HangingBreakEvent;
-import org.bukkit.event.hanging.HangingBreakEvent.RemoveCause;
-import org.bukkit.event.hanging.HangingPlaceEvent;
-import org.bukkit.event.player.PlayerInteractEntityEvent;
-import org.bukkit.projectiles.ProjectileSource;
-
-import com.sk89q.worldedit.blocks.ItemID;
-import com.sk89q.worldguard.blacklist.events.BlockBreakBlacklistEvent;
-import com.sk89q.worldguard.blacklist.events.ItemUseBlacklistEvent;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-
-/**
- * Listener for painting related events.
- *
- * @author BangL <henno.rickowski@gmail.com>
- */
-public class WorldGuardHangingListener implements Listener {
-
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     *
-     * @param plugin The plugin instance
-     */
-    public WorldGuardHangingListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Register events.
-     */
-    public void registerEvents() {
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onHangingingBreak(HangingBreakEvent event) {
-        Hanging hanging = event.getEntity();
-        World world = hanging.getWorld();
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (event instanceof HangingBreakByEntityEvent) {
-            HangingBreakByEntityEvent entityEvent = (HangingBreakByEntityEvent) event;
-            Entity removerEntity = entityEvent.getRemover();
-            if (removerEntity instanceof Projectile) {
-                Projectile projectile = (Projectile) removerEntity;
-                ProjectileSource remover = projectile.getShooter(); 
-                removerEntity = (remover instanceof LivingEntity ? (LivingEntity) remover : null);
-            }
-
-            if (removerEntity instanceof Player) {
-                Player player = (Player) removerEntity;
-
-                if (wcfg.getBlacklist() != null) {
-                    if (hanging instanceof Painting
-                            && !wcfg.getBlacklist().check(
-                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
-                                        toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
-                        event.setCancelled(true);
-                        return;
-                    } else if (hanging instanceof ItemFrame
-                            && !wcfg.getBlacklist().check(
-                                new BlockBreakBlacklistEvent(plugin.wrapPlayer(player),
-                                        toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-
-                if (wcfg.useRegions) {
-                    if (!plugin.getGlobalRegionManager().canBuild(player, hanging.getLocation())) {
-                        player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-            } else {
-                if (removerEntity instanceof Creeper) {
-                    if (wcfg.blockCreeperBlockDamage || wcfg.blockCreeperExplosions) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                    if (wcfg.useRegions && !plugin.getGlobalRegionManager().allows(DefaultFlag.CREEPER_EXPLOSION, hanging.getLocation())) {
-                        event.setCancelled(true);
-                        return;
-                    }
-                }
-
-                // this now covers dispensers as well, if removerEntity is null above,
-                // due to a non-LivingEntity ProjectileSource
-                if (hanging instanceof Painting
-                        && (wcfg.blockEntityPaintingDestroy
-                        || (wcfg.useRegions
-                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_PAINTING_DESTROY, hanging.getLocation())))) {
-                    event.setCancelled(true);
-                } else if (hanging instanceof ItemFrame
-                        && (wcfg.blockEntityItemFrameDestroy
-                        || (wcfg.useRegions
-                        && !plugin.getGlobalRegionManager().allows(DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, hanging.getLocation())))) {
-                    event.setCancelled(true);
-                }
-            }
-        } else {
-            // Explosions from mobs are not covered by HangingBreakByEntity
-            if (hanging instanceof Painting && wcfg.blockEntityPaintingDestroy
-                    && event.getCause() == RemoveCause.EXPLOSION) {
-                event.setCancelled(true);
-            } else if (hanging instanceof ItemFrame && wcfg.blockEntityItemFrameDestroy
-                    && event.getCause() == RemoveCause.EXPLOSION) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onHangingPlace(HangingPlaceEvent event) {
-        Block placedOn = event.getBlock();
-        Player player = event.getPlayer();
-        World world = placedOn.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.getBlacklist() != null) {
-
-            if (event.getEntity() instanceof Painting
-                    && !wcfg.getBlacklist().check(
-                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                                toVector(player.getLocation()), ItemID.PAINTING), false, false)) {
-                event.setCancelled(true);
-                return;
-            } else if (event.getEntity() instanceof ItemFrame
-                    && !wcfg.getBlacklist().check(
-                        new ItemUseBlacklistEvent(plugin.wrapPlayer(player),
-                                toVector(player.getLocation()), ItemID.ITEM_FRAME), false, false)) {
-                event.setCancelled(true);
-                return;
-            }
-        }
-
-        if (wcfg.useRegions) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, placedOn.getRelative(event.getBlockFace()))) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onEntityInteract(PlayerInteractEntityEvent event) {
-        Player player = event.getPlayer();
-        Entity entity = event.getRightClicked();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(entity.getWorld());
-
-        if (wcfg.useRegions && (entity instanceof ItemFrame || entity instanceof Painting)) {
-            if (!plugin.getGlobalRegionManager().canBuild(player, entity.getLocation())) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission for this area.");
-                event.setCancelled(true);
-                return;
-            }
-
-//            if (entity instanceof ItemFrame
-//                    && ((!plugin.getGlobalRegionManager().allows(
-//                            DefaultFlag.ENTITY_ITEM_FRAME_DESTROY, entity.getLocation())))) {
-//                event.setCancelled(true);
-//            } else if (entity instanceof Painting
-//                    && ((!plugin.getGlobalRegionManager().allows(
-//                            DefaultFlag.ENTITY_PAINTING_DESTROY, entity.getLocation())))) {
-//                event.setCancelled(true);
-//            }
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

@@ -1,874 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package com.sk89q.worldguard.bukkit;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.jar.JarFile;
-import java.util.zip.ZipEntry;
-
-import org.bukkit.ChatColor;
-import org.bukkit.Location;
-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 com.sk89q.bukkit.util.CommandsManagerRegistration;
-import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.minecraft.util.commands.CommandPermissionsException;
-import com.sk89q.minecraft.util.commands.CommandUsageException;
-import com.sk89q.minecraft.util.commands.CommandsManager;
-import com.sk89q.minecraft.util.commands.MissingNestedCommandException;
-import com.sk89q.minecraft.util.commands.SimpleInjector;
-import com.sk89q.minecraft.util.commands.WrappedCommandException;
-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.protection.GlobalRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
-
-/**
- * The main class for WorldGuard as a Bukkit plugin.
- *
- * @author sk89q
- */
-public class WorldGuardPlugin extends JavaPlugin {
-
-    /**
-     * Current instance of this plugin.
-     */
-    private static WorldGuardPlugin inst;
-
-    /**
-     * Manager for commands. This automatically handles nested commands,
-     * permissions checking, and a number of other fancy command things.
-     * We just set it up and register commands against it.
-     */
-    private final CommandsManager<CommandSender> commands;
-
-    /**
-     * Handles the region databases for all worlds.
-     */
-    private final GlobalRegionManager globalRegionManager;
-
-    /**
-     * Handles all configuration.
-     */
-    private final ConfigurationManager configuration;
-
-    /**
-     * Used for scheduling flags.
-     */
-    private FlagStateManager flagStateManager;
-
-    /**
-     * Construct objects. Actual loading occurs when the plugin is enabled, so
-     * this merely instantiates the objects.
-     */
-    public WorldGuardPlugin() {
-        configuration = new ConfigurationManager(this);
-        globalRegionManager = new GlobalRegionManager(this);
-
-        final WorldGuardPlugin plugin = inst = this;
-        commands = new CommandsManager<CommandSender>() {
-            @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() {
-
-        // Set the proper command injector
-        commands.setInjector(new SimpleInjector(this));
-
-        // 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);
-
-        // Need to create the plugins/WorldGuard folder
-        getDataFolder().mkdirs();
-
-        PermissionsResolverManager.initialize(this);
-
-        // This must be done before configuration is loaded
-        LegacyWorldGuardMigration.migrateBlacklist(this);
-
-        try {
-            // Load the configuration
-            configuration.load();
-            globalRegionManager.preload();
-        } catch (FatalConfigurationLoadingException e) {
-            e.printStackTrace();
-            getServer().shutdown();
-        }
-
-        // Migrate regions after the regions were loaded because
-        // the migration code reuses the loaded region managers
-        LegacyWorldGuardMigration.migrateRegions(this);
-
-        flagStateManager = new FlagStateManager(this);
-
-        if (configuration.useRegionsScheduler) {
-            getServer().getScheduler().scheduleSyncRepeatingTask(this, flagStateManager,
-                    FlagStateManager.RUN_DELAY, FlagStateManager.RUN_DELAY);
-        }
-
-        // Register events
-        (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();
-        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();
-
-        if (!configuration.hasCommandBookGodMode()) {
-            // Check god mode for existing players, if any
-            for (Player player : getServer().getOnlinePlayers()) {
-                if (inGroup(player, "wg-invincible") ||
-                        (configuration.autoGodMode && hasPermission(player, "worldguard.auto-invincible"))) {
-                    configuration.enableGodMode(player);
-                }
-            }
-        }
-    }
-
-    /**
-     * Called on plugin disable.
-     */
-    @Override
-    public void onDisable() {
-        globalRegionManager.unload();
-        configuration.unload();
-        this.getServer().getScheduler().cancelTasks(this);
-    }
-
-    /**
-     * Handle a command.
-     */
-    @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) {
-            if (e.getCause() instanceof NumberFormatException) {
-                sender.sendMessage(ChatColor.RED + "Number expected, string received instead.");
-            } else {
-                sender.sendMessage(ChatColor.RED + "An error has occurred. See console.");
-                e.printStackTrace();
-            }
-        } catch (CommandException e) {
-            sender.sendMessage(ChatColor.RED + e.getMessage());
-        }
-
-        return true;
-    }
-
-    /**
-     * Get the GlobalRegionManager.
-     *
-     * @return The plugin's global region manager
-     */
-    public GlobalRegionManager getGlobalRegionManager() {
-        return globalRegionManager;
-    }
-
-    /**
-     * 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 FlagStateManager getFlagStateManager() {
-        return flagStateManager;
-    }
-
-    /**
-     * 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;
-    }
-
-    /**
-     * 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.getName(), 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<Player> matchPlayerNames(String filter) {
-        Player[] players = getServer().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<Player> list = new ArrayList<Player>();
-                    list.add(player);
-                    return list;
-                }
-            }
-
-            return new ArrayList<Player>();
-        // Allow partial name matching
-        } else if (filter.charAt(0) == '*' && filter.length() >= 2) {
-            filter = filter.substring(1);
-
-            List<Player> list = new ArrayList<Player>();
-
-            for (Player player : players) {
-                if (player.getName().toLowerCase().contains(filter)) {
-                    list.add(player);
-                }
-            }
-
-            return list;
-
-        // Start with name matching
-        } else {
-            List<Player> list = new ArrayList<Player>();
-
-            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<Player> checkPlayerMatch(List<Player> 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<Player> matchPlayers(CommandSender source, String filter)
-            throws CommandException {
-
-        if (getServer().getOnlinePlayers().length == 0) {
-            throw new CommandException("No players matched query.");
-        }
-
-        if (filter.equals("*")) {
-            return checkPlayerMatch(Arrays.asList(getServer().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<Player> players = new ArrayList<Player>();
-                Player sourcePlayer = checkPlayer(source);
-                World sourceWorld = sourcePlayer.getWorld();
-
-                for (Player player : getServer().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<Player> players = new ArrayList<Player>();
-                Player sourcePlayer = checkPlayer(source);
-                World sourceWorld = sourcePlayer.getWorld();
-                org.bukkit.util.Vector sourceVector
-                        = sourcePlayer.getLocation().toVector();
-
-                for (Player player : getServer().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<Player> 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<Player> 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 @<name> 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<Player> 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<World> 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);
-    }
-
-    /**
-     * 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) {
-                getLogger().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);
-                }
-
-                getLogger().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<Permissible> subs = getServer().getPluginManager().getPermissionSubscriptions("worldguard.notify");
-        for (Player player : getServer().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);
-            }
-        }
-        getLogger().info(msg);
-    }
-
-    /**
-     * Forgets a player.
-     *
-     * @param player The player to remove state information for
-     */
-    public void forgetPlayer(Player player) {
-        flagStateManager.forget(player);
-    }
-
-    /**
-     * 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);
-    }
-
-    /**
-     * 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) {
-        Player[] online = getServer().getOnlinePlayers();
-
-        message = message.replace("%name%", toName(sender));
-        message = message.replace("%id%", toUniqueName(sender));
-        message = message.replace("%online%", String.valueOf(online.length));
-
-        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;
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardServerListener.java

@@ -1,38 +0,0 @@
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.server.PluginDisableEvent;
-import org.bukkit.event.server.PluginEnableEvent;
-import org.bukkit.plugin.PluginManager;
-
-/**
- * @author zml2008
- */
-public class WorldGuardServerListener implements Listener {
-
-    private final WorldGuardPlugin plugin;
-
-    public WorldGuardServerListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    public void registerEvents() {
-        PluginManager pm = plugin.getServer().getPluginManager();
-        pm.registerEvents(this, plugin);
-    }
-
-    @EventHandler
-    public void onPluginEnable(PluginEnableEvent event) {
-        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
-            plugin.getGlobalStateManager().updateCommandBookGodMode();
-        }
-    }
-
-    @EventHandler
-    public void onPluginDisable(PluginDisableEvent event) {
-        if (event.getPlugin().getDescription().getName().equalsIgnoreCase("CommandBook")) {
-            plugin.getGlobalStateManager().updateCommandBookGodMode();
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardVehicleListener.java

@@ -1,96 +0,0 @@
-// $Id$
-/*
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- * All rights reserved.
-*/
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.entity.Player;
-import org.bukkit.entity.Vehicle;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.vehicle.VehicleDestroyEvent;
-import org.bukkit.event.vehicle.VehicleMoveEvent;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class WorldGuardVehicleListener implements Listener {
-
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     *
-     * @param plugin
-     */
-    public WorldGuardVehicleListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Register events.
-     */
-    public void registerEvents() {
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-
-    @EventHandler
-    public void onVehicleDestroy(VehicleDestroyEvent event) {
-        Vehicle vehicle = event.getVehicle();
-        Entity destroyer = event.getAttacker();
-
-        if (!(destroyer instanceof Player)) return; // don't care
-        Player player = (Player) destroyer;
-        World world = vehicle.getWorld();
-
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.useRegions) {
-            Vector pt = toVector(vehicle.getLocation());
-            RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-            LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-            if (!plugin.getGlobalRegionManager().hasBypass(player, world)
-                    && !set.canBuild(localPlayer)
-                    && !set.allows(DefaultFlag.DESTROY_VEHICLE, localPlayer)) {
-                player.sendMessage(ChatColor.DARK_RED + "You don't have permission to destroy vehicles here.");
-                event.setCancelled(true);
-                return;
-            }
-        }
-    }
-
-    @EventHandler
-    public void onVehicleMove(VehicleMoveEvent event) {
-        Vehicle vehicle = event.getVehicle();
-        if (vehicle.getPassenger() == null
-                || !(vehicle.getPassenger() instanceof Player)) return;
-        Player player = (Player) vehicle.getPassenger();
-        World world = vehicle.getWorld();
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-
-        if (wcfg.useRegions) {
-            // Did we move a block?
-            if (event.getFrom().getBlockX() != event.getTo().getBlockX()
-                    || event.getFrom().getBlockY() != event.getTo().getBlockY()
-                    || event.getFrom().getBlockZ() != event.getTo().getBlockZ()) {
-                boolean result = WorldGuardPlayerListener.checkMove(plugin, player, event.getFrom(), event.getTo());
-                if (result) {
-                    vehicle.setVelocity(new org.bukkit.util.Vector(0,0,0));
-                    vehicle.teleport(event.getFrom());
-                }
-            }
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWeatherListener.java

@@ -1,110 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.bukkit;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import org.bukkit.Location;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.weather.LightningStrikeEvent;
-import org.bukkit.event.weather.ThunderChangeEvent;
-import org.bukkit.event.weather.WeatherChangeEvent;
-import com.sk89q.worldedit.Vector;
-import com.sk89q.worldguard.protection.ApplicableRegionSet;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public class WorldGuardWeatherListener implements Listener {
-
-    /**
-     * Plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     *
-     * @param plugin The plugin instance
-     */
-    public WorldGuardWeatherListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    public void registerEvents() {
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onWeatherChange(WeatherChangeEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getWorld());
-
-        if (event.toWeatherState()) {
-            if (wcfg.disableWeather) {
-                event.setCancelled(true);
-            }
-        } else {
-            if (!wcfg.disableWeather && wcfg.alwaysRaining) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onThunderChange(ThunderChangeEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getWorld());
-
-        if (event.toThunderState()) {
-            if (wcfg.disableThunder) {
-                event.setCancelled(true);
-            }
-        } else {
-            if (!wcfg.disableWeather && wcfg.alwaysThundering) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
-    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
-    public void onLightningStrike(LightningStrikeEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(event.getWorld());
-
-        if (wcfg.disallowedLightningBlocks.size() > 0) {
-            int targetId = event.getLightning().getLocation().getBlock().getTypeId();
-            if (wcfg.disallowedLightningBlocks.contains(targetId)) {
-                event.setCancelled(true);
-            }
-        }
-
-        Location loc = event.getLightning().getLocation();
-        if (wcfg.useRegions) {
-            Vector pt = toVector(loc);
-            RegionManager mgr = plugin.getGlobalRegionManager().get(loc.getWorld());
-            ApplicableRegionSet set = mgr.getApplicableRegions(pt);
-
-            if (!set.allows(DefaultFlag.LIGHTNING)) {
-                event.setCancelled(true);
-            }
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/WorldGuardWorldListener.java

@@ -1,83 +0,0 @@
-// $Id$
-/*
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- * All rights reserved.
-*/
-package com.sk89q.worldguard.bukkit;
-
-import org.bukkit.World;
-import org.bukkit.entity.Entity;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.world.ChunkLoadEvent;
-import org.bukkit.event.world.WorldLoadEvent;
-
-public class WorldGuardWorldListener implements Listener {
-
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Construct the object;
-     *
-     * @param plugin The plugin instance
-     */
-    public WorldGuardWorldListener(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    /**
-     * Register events.
-     */
-    public void registerEvents() {
-        plugin.getServer().getPluginManager().registerEvents(this, plugin);
-    }
-
-    @EventHandler
-    public void onChunkLoad(ChunkLoadEvent event) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-
-        if (cfg.activityHaltToggle) {
-            int removed = 0;
-
-            for (Entity entity : event.getChunk().getEntities()) {
-                if (BukkitUtil.isIntensiveEntity(entity)) {
-                    entity.remove();
-                    removed++;
-                }
-            }
-
-            if (removed > 50) {
-                plugin.getLogger().info("Halt-Act: " + removed + " entities (>50) auto-removed from "
-                        + event.getChunk().toString());
-            }
-        }
-    }
-
-    @EventHandler
-    public void onWorldLoad(WorldLoadEvent event) {
-        initWorld(event.getWorld());
-    }
-
-    /**
-     * Initialize the settings for the specified world
-     * @see WorldConfiguration#alwaysRaining
-     * @see WorldConfiguration#disableWeather
-     * @see WorldConfiguration#alwaysThundering
-     * @see WorldConfiguration#disableThunder
-     * @param world The specified world
-     */
-    public void initWorld(World world) {
-        ConfigurationManager cfg = plugin.getGlobalStateManager();
-        WorldConfiguration wcfg = cfg.get(world);
-        if (wcfg.alwaysRaining && !wcfg.disableWeather) {
-            world.setStorm(true);
-        } else if (wcfg.disableWeather && !wcfg.alwaysRaining) {
-            world.setStorm(false);
-        }
-        if (wcfg.alwaysThundering && !wcfg.disableThunder) {
-            world.setThundering(true);
-        } else if (wcfg.disableThunder && !wcfg.alwaysThundering) {
-            world.setStorm(false);
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/GeneralCommands.java

@@ -1,305 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-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;
-
-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<Player> 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 if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            config.enableGodMode(player);
-            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.toString() + "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<Player> 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 if (args.argsLength() == 1) {            
-            targets = plugin.matchPlayers(sender, args.getString(0));
-            
-            // Check permissions!
-            plugin.checkPermission(sender, "worldguard.god.other");
-        }
-
-        for (Player player : targets) {
-            config.disableGodMode(player);
-            
-            // 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.toString() + "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<Player> 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(20);
-            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<Player> 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!");
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/ProtectionCommands.java

@@ -1,44 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-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, RegionMemberCommands.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) {}
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionListEntry.java

@@ -1,58 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the 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
- * (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 <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-/**
- * Used for /rg list.
- */
-class RegionListEntry implements Comparable<RegionListEntry> {
-    
-    private final String id;
-    private final int index;
-    boolean isOwner;
-    boolean isMember;
-
-    public RegionListEntry(String id, int index) {
-        this.id = id;
-        this.index = index;
-    }
-
-    @Override
-    public int compareTo(RegionListEntry o) {
-        if (isOwner != o.isOwner) {
-            return isOwner ? 1 : -1;
-        }
-        if (isMember != o.isMember) {
-            return isMember ? 1 : -1;
-        }
-        return id.compareTo(o.id);
-    }
-
-    @Override
-    public String toString() {
-        if (isOwner) {
-            return (index + 1) + ". +" + id;
-        } else if (isMember) {
-            return (index + 1) + ". -" + id;
-        } else {
-            return (index + 1) + ". " + id;
-        }
-    }
-    
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionMemberCommands.java

@@ -1,303 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import org.bukkit.ChatColor;
-import org.bukkit.World;
-import org.bukkit.command.CommandSender;
-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.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.RegionDBUtil;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-// @TODO: A lot of code duplication here! Need to fix.
-
-public class RegionMemberCommands {
-    private final WorldGuardPlugin plugin;
-
-    public RegionMemberCommands(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-    }
-
-    @Command(aliases = {"addmember", "addmember"},
-            usage = "<id> <members...>",
-            flags = "w:",
-            desc = "Add a member to a region",
-            min = 2)
-    public void addMember(CommandContext args, CommandSender sender) throws CommandException {
-        final World world;
-        Player player = null;
-        LocalPlayer localPlayer = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-            localPlayer = plugin.wrapPlayer(player);
-        }
-        if (args.hasFlag('w')) {
-            world = plugin.matchWorld(sender, args.getFlag('w'));
-        } else {
-            if (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-
-        id = region.getId();
-
-        if (localPlayer != null) {
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.addmember.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.addmember.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.addmember." + id.toLowerCase());
-            }
-        }
-
-        RegionDBUtil.addToDomain(region.getMembers(), args.getParsedPaddedSlice(1, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-
-        try {
-            mgr.save();
-        } catch (ProtectionDatabaseException e) {
-            throw new CommandException("Failed to write regions: "
-                    + e.getMessage());
-        }
-    }
-
-    @Command(aliases = {"addowner", "addowner"},
-            usage = "<id> <owners...>",
-            flags = "w:",
-            desc = "Add an owner to a region",
-            min = 2)
-    public void addOwner(CommandContext args, CommandSender sender) throws CommandException {
-        final World world;
-        Player player = null;
-        LocalPlayer localPlayer = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-            localPlayer = plugin.wrapPlayer(player);
-        }
-        if (args.hasFlag('w')) {
-            world = plugin.matchWorld(sender, args.getFlag('w'));
-        } else {
-            if (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-
-        id = region.getId();
-
-        Boolean flag = region.getFlag(DefaultFlag.BUYABLE);
-        DefaultDomain owners = region.getOwners();
-        if (localPlayer != null) {
-            if (flag != null && flag && owners != null && owners.size() == 0) {
-                if (!plugin.hasPermission(player, "worldguard.region.unlimited")) {
-                    int maxRegionCount = plugin.getGlobalStateManager().get(world).getMaxRegionCount(player);
-                    if (maxRegionCount >= 0 && mgr.getRegionCountOfPlayer(localPlayer)
-                            >= maxRegionCount) {
-                        throw new CommandException("You already own the maximum allowed amount of regions.");
-                    }
-                }
-                plugin.checkPermission(sender, "worldguard.region.addowner.unclaimed." + id.toLowerCase());
-            } else {
-                if (region.isOwner(localPlayer)) {
-                    plugin.checkPermission(sender, "worldguard.region.addowner.own." + id.toLowerCase());
-                } else if (region.isMember(localPlayer)) {
-                    plugin.checkPermission(sender, "worldguard.region.addowner.member." + id.toLowerCase());
-                } else {
-                    plugin.checkPermission(sender, "worldguard.region.addowner." + id.toLowerCase());
-                }
-            }
-        }
-
-        RegionDBUtil.addToDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-
-        try {
-            mgr.save();
-        } catch (ProtectionDatabaseException e) {
-            throw new CommandException("Failed to write regions: "
-                    + e.getMessage());
-        }
-    }
-
-    @Command(aliases = {"removemember", "remmember", "removemem", "remmem"},
-            usage = "<id> <owners...>",
-            flags = "aw:",
-            desc = "Remove an owner to a region",
-            min = 1)
-    public void removeMember(CommandContext args, CommandSender sender) throws CommandException {
-        final World world;
-        Player player = null;
-        LocalPlayer localPlayer = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-            localPlayer = plugin.wrapPlayer(player);
-        }
-        if (args.hasFlag('w')) {
-            world = plugin.matchWorld(sender, args.getFlag('w'));
-        } else {
-            if (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-
-        id = region.getId();
-
-        if (localPlayer != null) {
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.removemember.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.removemember.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.removemember." + id.toLowerCase());
-            }
-        }
-
-        if (args.hasFlag('a')) {
-            region.getMembers().removeAll();
-        } else {
-            if (args.argsLength() < 2) {
-                throw new CommandException("List some names to remove, or use -a to remove all.");
-            }
-            RegionDBUtil.removeFromDomain(region.getMembers(), args.getParsedPaddedSlice(1, 0), 0);
-        }
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-
-        try {
-            mgr.save();
-        } catch (ProtectionDatabaseException e) {
-            throw new CommandException("Failed to write regions: "
-                    + e.getMessage());
-        }
-    }
-
-    @Command(aliases = {"removeowner", "remowner"},
-            usage = "<id> <owners...>",
-            flags = "aw:",
-            desc = "Remove an owner to a region",
-            min = 1)
-    public void removeOwner(CommandContext args,
-            CommandSender sender) throws CommandException {
-        final World world;
-        Player player = null;
-        LocalPlayer localPlayer = null;
-        if (sender instanceof Player) {
-            player = (Player) sender;
-            localPlayer = plugin.wrapPlayer(player);
-        }
-        if (args.hasFlag('w')) {
-            world = plugin.matchWorld(sender, args.getFlag('w'));
-        } else {
-            if (player != null) {
-                world = player.getWorld();
-            } else {
-                throw new CommandException("No world specified. Use -w <worldname>.");
-            }
-        }
-
-        String id = args.getString(0);
-
-        RegionManager mgr = plugin.getGlobalRegionManager().get(world);
-        ProtectedRegion region = mgr.getRegion(id);
-
-        if (region == null) {
-            throw new CommandException("Could not find a region by that ID.");
-        }
-
-        id = region.getId();
-
-        if (localPlayer != null) {
-            if (region.isOwner(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.removeowner.own." + id.toLowerCase());
-            } else if (region.isMember(localPlayer)) {
-                plugin.checkPermission(sender, "worldguard.region.removeowner.member." + id.toLowerCase());
-            } else {
-                plugin.checkPermission(sender, "worldguard.region.removeowner." + id.toLowerCase());
-            }
-        }
-
-        if (args.hasFlag('a')) {
-            region.getOwners().removeAll();
-        } else {
-            if (args.argsLength() < 2) {
-                throw new CommandException("List some names to remove, or use -a to remove all.");
-            }
-            RegionDBUtil.removeFromDomain(region.getOwners(), args.getParsedPaddedSlice(1, 0), 0);
-        }
-
-        sender.sendMessage(ChatColor.YELLOW
-                + "Region '" + id + "' updated.");
-
-        try {
-            mgr.save();
-        } catch (ProtectionDatabaseException e) {
-            throw new CommandException("Failed to write regions: "
-                    + e.getMessage());
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/RegionPrintoutBuilder.java

@@ -1,334 +0,0 @@
-// $Id$
-/*
- * This file is a part of WorldGuard.
- * Copyright (c) sk89q <http://www.sk89q.com>
- * Copyright (c) the 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
- * (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 <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.protection.flags.DefaultFlag;
-import com.sk89q.worldguard.protection.flags.Flag;
-import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-/**
- * Create a region printout, as used in /region info to show information about
- * a region.
- */
-public class RegionPrintoutBuilder {
-    
-    private final ProtectedRegion region;
-    private final StringBuilder builder = new StringBuilder();
-
-    /**
-     * Create a new instance with a region to report on.
-     * 
-     * @param region the region
-     */
-    public RegionPrintoutBuilder(ProtectedRegion region) {
-        this.region = region;
-    }
-
-    /**
-     * Add a new line.
-     */
-    private void newLine() {
-        builder.append("\n");
-    }
-    
-    /**
-     * Add region name, type, and priority.
-     */
-    public void appendBasics() {
-        builder.append(ChatColor.BLUE);
-        builder.append("Region: ");
-        builder.append(ChatColor.YELLOW);
-        builder.append(region.getId());
-        
-        builder.append(ChatColor.GRAY);
-        builder.append(" (type=");
-        builder.append(region.getTypeName());
-        
-        builder.append(ChatColor.GRAY);
-        builder.append(", priority=");
-        builder.append(region.getPriority());
-        builder.append(")");
-
-        newLine();
-    }
-    
-    /**
-     * Add information about flags.
-     */
-    public void appendFlags() {
-        builder.append(ChatColor.BLUE);
-        builder.append("Flags: ");
-        
-        appendFlagsList(true);
-        
-        newLine();
-    }
-    
-    /**
-     * Append just the list of flags (without "Flags:"), including colors.
-     *
-     * @param useColors true to use colors
-     */
-    public void appendFlagsList(boolean useColors) {
-        boolean hasFlags = false;
-        
-        for (Flag<?> flag : DefaultFlag.getFlags()) {
-            Object val = region.getFlag(flag), group = null;
-            
-            // No value
-            if (val == null) {
-                continue;
-            }
-
-            if (hasFlags) {
-                builder.append(", ");
-            } else {
-                if (useColors) {
-                    builder.append(ChatColor.YELLOW);
-                }
-            }
-
-            RegionGroupFlag groupFlag = flag.getRegionGroupFlag();
-            if (groupFlag != null) {
-                group = region.getFlag(groupFlag);
-            }
-
-            if(group == null) {
-                builder.append(flag.getName()).append(": ")
-                    .append(String.valueOf(val));
-            } else {
-                builder.append(flag.getName()).append(" -g ")
-                    .append(String.valueOf(group)).append(": ")
-                    .append(String.valueOf(val));
-            }
-
-            hasFlags = true;
-        }
-            
-        if (!hasFlags) {
-            if (useColors) {
-                builder.append(ChatColor.RED);
-            }
-            builder.append("(none)");
-        }
-    }
-    
-    /**
-     * Add information about parents.
-     */
-    public void appendParents() {
-        appendParentTree(true);
-    }
-    
-    /**
-     * Add information about parents.
-     * 
-     * @param useColors true to use colors
-     */
-    public void appendParentTree(boolean useColors) {
-        if (region.getParent() == null) {
-            return;
-        }
-        
-        List<ProtectedRegion> inheritance = new ArrayList<ProtectedRegion>();
-
-        ProtectedRegion r = region;
-        inheritance.add(r);
-        while (r.getParent() != null) {
-            r = r.getParent();
-            inheritance.add(r);
-        }
-
-        ListIterator<ProtectedRegion> it = inheritance.listIterator(
-                inheritance.size());
-
-        int indent = 0;
-        while (it.hasPrevious()) {
-            ProtectedRegion cur = it.previous();
-            if (useColors) {
-                builder.append(ChatColor.GREEN);
-            }
-            
-            // Put symbol for child
-            if (indent != 0) {
-                for (int i = 0; i < indent; i++) {
-                    builder.append("  ");
-                }
-                builder.append("\u2517");
-            }
-            
-            // Put name
-            builder.append(cur.getId());
-            
-            // Put (parent)
-            if (!cur.equals(region)) {
-                if (useColors) {
-                    builder.append(ChatColor.GRAY);
-                }
-                builder.append(" (parent, priority=" + cur.getPriority() + ")");
-            }
-            
-            indent++;
-            newLine();
-        }
-    }
-    
-    /**
-     * Add information about members.
-     */
-    public void appendDomain() {
-        builder.append(ChatColor.BLUE);
-        builder.append("Owners: ");
-        DefaultDomain owners = region.getOwners();
-        if (owners.size() != 0) {
-            builder.append(ChatColor.YELLOW);
-            builder.append(owners.toUserFriendlyString());
-        } else {
-            builder.append(ChatColor.RED);
-            builder.append("(no owners)");
-        }
-
-        newLine();
-
-        builder.append(ChatColor.BLUE);
-        builder.append("Members: ");
-        DefaultDomain members = region.getMembers();
-        if (members.size() != 0) {
-            builder.append(ChatColor.YELLOW);
-            builder.append(members.toUserFriendlyString());
-        } else {
-            builder.append(ChatColor.RED);
-            builder.append("(no members)");
-        }
-        
-        newLine();
-    }
-    
-    /**
-     * Add information about coordinates.
-     */
-    public void appendBounds() {
-        BlockVector min = region.getMinimumPoint();
-        BlockVector max = region.getMaximumPoint();
-        builder.append(ChatColor.BLUE);
-        builder.append("Bounds:");
-        builder.append(ChatColor.YELLOW);
-        builder.append(" (" + min.getBlockX() + "," + min.getBlockY() + "," + min.getBlockZ() + ")");
-        builder.append(" -> (" + max.getBlockX() + "," + max.getBlockY() + "," + max.getBlockZ() + ")");
-        
-        newLine();
-    }
-    
-    /**
-     * Append all the default fields used for /rg info.
-     */
-    public void appendRegionInfo() {
-        builder.append(ChatColor.GRAY);
-        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
-        builder.append(" Region Info ");
-        builder.append("\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550");
-        newLine();
-        appendBasics();
-        appendFlags();
-        appendParents();
-        appendDomain();
-        appendBounds();
-    }
-    
-    /**
-     * Send the report to a {@link CommandSender}.
-     * 
-     * @param sender the recepient
-     */
-    public void send(CommandSender sender) {
-        sender.sendMessage(toString());
-    }
-    
-    public StringBuilder append(boolean b) {
-        return builder.append(b);
-    }
-
-    public StringBuilder append(char c) {
-        return builder.append(c);
-    }
-
-    public StringBuilder append(char[] str, int offset, int len) {
-        return builder.append(str, offset, len);
-    }
-
-    public StringBuilder append(char[] str) {
-        return builder.append(str);
-    }
-
-    public StringBuilder append(CharSequence s, int start, int end) {
-        return builder.append(s, start, end);
-    }
-
-    public StringBuilder append(CharSequence s) {
-        return builder.append(s);
-    }
-
-    public StringBuilder append(double d) {
-        return builder.append(d);
-    }
-
-    public StringBuilder append(float f) {
-        return builder.append(f);
-    }
-
-    public StringBuilder append(int i) {
-        return builder.append(i);
-    }
-
-    public StringBuilder append(long lng) {
-        return builder.append(lng);
-    }
-
-    public StringBuilder append(Object obj) {
-        return builder.append(obj);
-    }
-
-    public StringBuilder append(String str) {
-        return builder.append(str);
-    }
-
-    public StringBuilder append(StringBuffer sb) {
-        return builder.append(sb);
-    }
-
-    public StringBuilder appendCodePoint(int codePoint) {
-        return builder.appendCodePoint(codePoint);
-    }
-    
-    @Override
-    public String toString() {
-        return builder.toString().trim();
-    }
-
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/ToggleCommands.java

@@ -1,145 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-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 = "[<world>]",
-            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 = "[<world>]",
-            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 = "c", max = 0)
-    @CommandPermissions({"worldguard.halt-activity"})
-    public void stopLag(CommandContext args, CommandSender sender) throws CommandException {
-
-        ConfigurationManager configManager = plugin.getGlobalStateManager();
-
-        configManager.activityHaltToggle = !args.hasFlag('c');
-
-        if (configManager.activityHaltToggle) {
-            if (!(sender instanceof Player)) {
-                sender.sendMessage(ChatColor.YELLOW
-                        + "ALL intensive server activity halted.");
-            }
-
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "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 (!(sender instanceof Player)) {
-                sender.sendMessage(ChatColor.YELLOW
-                        + "ALL intensive server activity no longer halted.");
-            }
-
-            plugin.getServer().broadcastMessage(ChatColor.YELLOW
-                    + "ALL intensive server activity is now allowed.");
-        }
-    }
-}

src/main/java/com/sk89q/worldguard/bukkit/commands/WorldGuardCommands.java

@@ -1,138 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.bukkit.commands;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-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.LoggerToChatHandler;
-import com.sk89q.worldguard.bukkit.ReportWriter;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.util.PastebinPoster;
-import com.sk89q.worldguard.util.PastebinPoster.PasteCallback;
-
-public class WorldGuardCommands {
-    private final WorldGuardPlugin plugin;
-
-    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 {
-        
-        LoggerToChatHandler handler = null;
-        Logger minecraftLogger = null;
-        
-        if (sender instanceof Player) {
-            handler = new LoggerToChatHandler(sender);
-            handler.setLevel(Level.ALL);
-            minecraftLogger = Logger.getLogger("Minecraft");
-            minecraftLogger.addHandler(handler);
-        }
-
-        try {
-            plugin.getGlobalStateManager().unload();
-            plugin.getGlobalRegionManager().unload();
-            plugin.getGlobalStateManager().load();
-            plugin.getGlobalRegionManager().preload();
-            // 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 {
-        
-        File dest = new File(plugin.getDataFolder(), "report.txt");
-        ReportWriter report = new ReportWriter(plugin);
-        
-        try {
-            report.write(dest);
-            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");
-            
-            sender.sendMessage(ChatColor.YELLOW + "Now uploading to Pastebin...");
-            PastebinPoster.paste(report.toString(), new PasteCallback() {
-                
-                public void handleSuccess(String url) {
-                    // Hope we don't have a thread safety issue here
-                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report (1 hour): " + url);
-                }
-                
-                public void handleError(String err) {
-                    // Hope we don't have a thread safety issue here
-                    sender.sendMessage(ChatColor.YELLOW + "WorldGuard report pastebin error: " + err);
-                }
-            });
-        }
-
-    }
-
-    @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.getFlagStateManager().forgetAll();
-            sender.sendMessage("Cleared all states.");
-        } else {
-            Player player = plugin.getServer().getPlayer(args.getString(0));
-            if (player != null) {
-                plugin.getFlagStateManager().forget(player);
-                sender.sendMessage("Cleared states for player \"" + player.getName() + "\".");
-            }
-        }
-    }
-
-}

src/main/java/com/sk89q/worldguard/chest/ChestProtection.java

@@ -1,77 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-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);
-
-}

src/main/java/com/sk89q/worldguard/chest/SignChestProtection.java

@@ -1,159 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-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;
-    }
-}

src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java

@@ -1,143 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.domains;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import com.sk89q.worldguard.LocalPlayer;
-
-public class DefaultDomain implements Domain {
-    private final Set<String> groups;
-    private final Set<String> players;
-    
-    public DefaultDomain() {
-        this.groups = new LinkedHashSet<String>();
-        this.players = new HashSet<String>();
-    }
-    
-    public void addPlayer(String name) {
-        players.add(name.toLowerCase());
-    }
-    
-    public void addPlayer(LocalPlayer player) {
-        players.add(player.getName().toLowerCase());
-    }
-    
-    public void removePlayer(String name) {
-        players.remove(name.toLowerCase());
-    }
-    
-    public void removePlayer(LocalPlayer player) {
-        players.remove(player.getName().toLowerCase());
-    }
-    
-    public void addGroup(String name) {
-        groups.add(name.toLowerCase());
-    }
-    
-    public void removeGroup(String name) {
-        groups.remove(name.toLowerCase());
-    }
-    
-    public Set<String> getGroups() {
-        return groups;
-    }
-    
-    public Set<String> getPlayers() {
-        return players;
-    }
-
-    @Override
-    public boolean contains(LocalPlayer player) {
-        if (contains(player.getName())) {
-            return true;
-        }
-
-        for (String group : groups) {
-            if (player.hasGroup(group)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean contains(String playerName) {
-        return players.contains(playerName.toLowerCase());
-    }
-
-    public int size() {
-        return groups.size() + players.size();
-    }
-    
-    public String toPlayersString() {
-        StringBuilder str = new StringBuilder();
-        List<String> output = new ArrayList<String>(players);
-        Collections.sort(output, String.CASE_INSENSITIVE_ORDER);
-        for (Iterator<String> 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<String> it = groups.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 (players.size() > 0) {
-            str.append(toPlayersString());
-        }
-        
-        if (groups.size() > 0) {
-            if (str.length() > 0) {
-                str.append("; ");
-            }
-            
-            str.append(toGroupsString());
-        }
-        
-        return str.toString();
-    }
-
-    public void removeAll() {
-        groups.clear();
-        players.clear();
-    }
-}

src/main/java/com/sk89q/worldguard/domains/Domain.java

@@ -1,22 +0,0 @@
-package com.sk89q.worldguard.domains;
-
-import com.sk89q.worldguard.LocalPlayer;
-
-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.<br />
-     * 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
-     */
-    boolean contains(String playerName);
-}

src/main/java/com/sk89q/worldguard/domains/DomainCollection.java

@@ -1,67 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.domains;
-
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import com.sk89q.worldguard.LocalPlayer;
-
-public class DomainCollection implements Domain {
-    private Set<Domain> domains;
-
-    public DomainCollection() {
-        domains = new LinkedHashSet<Domain>();
-    }
-
-    public void add(Domain domain) {
-        domains.add(domain);
-    }
-
-    public void remove(Domain domain) {
-        domains.remove(domain);
-    }
-
-    public int size() {
-        return domains.size();
-    }
-
-    @Override
-    public boolean contains(LocalPlayer player) {
-        for (Domain domain : domains) {
-            if (domain.contains(player)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean contains(String playerName) {
-        for (Domain domain : domains) {
-            if (domain.contains(playerName)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-}

src/main/java/com/sk89q/worldguard/domains/GroupDomain.java

@@ -1,61 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.domains;
-
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import com.sk89q.worldguard.LocalPlayer;
-
-public class GroupDomain implements Domain {
-    private Set<String> groups;
-
-    public GroupDomain() {
-        this.groups = new LinkedHashSet<String>();
-    }
-
-    public GroupDomain(String[] groups) {
-        this.groups = new LinkedHashSet<String>(Arrays.asList(groups));
-    }
-
-    public void addGroup(String name) {
-        groups.add(name);
-    }
-
-    public boolean contains(LocalPlayer player) {
-        for (String group : groups) {
-            if (player.hasGroup(group)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean contains(String playerName) {
-        return false; // GroupDomains can't contain player names.
-    }
-
-    public int size() {
-        return groups.size();
-    }
-}

src/main/java/com/sk89q/worldguard/domains/PlayerDomain.java

@@ -1,58 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.domains;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import com.sk89q.worldguard.LocalPlayer;
-
-public class PlayerDomain implements Domain {
-    private Set<String> players;
-
-    public PlayerDomain() {
-        this.players = new HashSet<String>();
-    }
-
-    public PlayerDomain(String[] players) {
-        this.players = new HashSet<String>();
-
-        for (String name : players) {
-            this.players.add(name.toLowerCase());
-        }
-    }
-
-    public void addPlayer(String name) {
-        players.add(name.toLowerCase());
-    }
-
-    public boolean contains(LocalPlayer player) {
-        return contains(player.getName());
-    }
-
-    @Override
-    public boolean contains(String playerName) {
-        return players.contains(playerName.toLowerCase());
-    }
-
-    public int size() {
-        return players.size();
-    }
-}

src/main/java/com/sk89q/worldguard/protection/ApplicableRegionSet.java

@@ -1,402 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.protection;
-
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.flags.*;
-import com.sk89q.worldguard.protection.flags.StateFlag.State;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-
-import java.util.*;
-
-/**
- * Represents a set of regions for a particular point or area and the rules
- * that are represented by that set. An instance of this can be used to
- * query the value of a flag or check if a player can build in the respective
- * region or point. This object contains the list of applicable regions and so
- * the expensive search of regions that are in the desired area has already
- * been completed.
- * 
- * @author sk89q
- */
-public class ApplicableRegionSet implements Iterable<ProtectedRegion> {
-
-    private Collection<ProtectedRegion> applicable;
-    private ProtectedRegion globalRegion;
-
-    /**
-     * Construct the object.
-     * 
-     * @param applicable The regions contained in this set
-     * @param globalRegion The global region, set aside for special handling.
-     */
-    public ApplicableRegionSet(Collection<ProtectedRegion> applicable,
-            ProtectedRegion globalRegion) {
-        this.applicable = applicable;
-        this.globalRegion = globalRegion;
-    }
-    
-    /**
-     * Checks if a player can build in an area.
-     * 
-     * @param player The player to check
-     * @return build ability
-     */
-    public boolean canBuild(LocalPlayer player) {
-        return internalGetState(DefaultFlag.BUILD, player, null);
-    }
-
-    public boolean canConstruct(LocalPlayer player) {
-        final RegionGroup flag = getFlag(DefaultFlag.CONSTRUCT, player);
-        return RegionGroupFlag.isMember(this, flag, player);
-    }
-
-    /**
-     * Checks if a player can use buttons and such in an area.
-     * 
-     * @param player The player to check
-     * @return able to use items
-     * @deprecated This method seems to be the opposite of its name
-     */
-    @Deprecated
-    public boolean canUse(LocalPlayer player) {
-        return !allows(DefaultFlag.USE, player)
-                && !canBuild(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
-     */
-    public boolean allows(StateFlag flag) {
-        if (flag == DefaultFlag.BUILD) {
-            throw new IllegalArgumentException("Can't use build flag with allows()");
-        }
-        return internalGetState(flag, null, null);
-    }
-    
-    /**
-     * 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
-     */
-    public boolean allows(StateFlag flag, LocalPlayer player) {
-        if (flag == DefaultFlag.BUILD) {
-            throw new IllegalArgumentException("Can't use build flag with allows()");
-        }
-        return internalGetState(flag, null, player);
-    }
-    
-    /**
-     * Indicates whether a player is an owner of all regions in this set.
-     * 
-     * @param player player
-     * @return whether the player is an owner of all regions
-     */
-    public boolean isOwnerOfAll(LocalPlayer player) {
-        for (ProtectedRegion region : applicable) {
-            if (!region.isOwner(player)) {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-    
-    /**
-     * Indicates whether a player is an owner or member of all regions in
-     * this set.
-     * 
-     * @param player player
-     * @return whether the player is a member of all regions
-     */
-    public boolean isMemberOfAll(LocalPlayer player) {
-        for (ProtectedRegion region : applicable) {
-            if (!region.isMember(player)) {
-                return false;
-            }
-        }
-        
-        return true;
-    }
-
-    /**
-     * Checks to see if a flag is permitted.
-     * 
-     * @param flag flag to check
-     * @param player null to not check owners and members
-     * @param groupPlayer player to use for the group flag check
-     * @return the allow/deny state for the flag
-     */
-    private boolean internalGetState(StateFlag flag, LocalPlayer player,
-                                     LocalPlayer groupPlayer) {
-        boolean found = false;
-        boolean hasFlagDefined = false;
-        boolean allowed = false; // Used for ALLOW override
-        boolean def = flag.getDefault();
-        
-        // Handle defaults
-        if (globalRegion != null) {
-            State globalState = globalRegion.getFlag(flag);
-
-            // The global region has this flag set
-            if (globalState != null) {
-                // Build flag is very special
-                if (player != null && globalRegion.hasMembersOrOwners()) {
-                    def = globalRegion.isMember(player) && (globalState == State.ALLOW);
-                } else {
-                    def = (globalState == State.ALLOW);
-                }
-            } else {
-                // Build flag is very special
-                if (player != null && globalRegion.hasMembersOrOwners()) {
-                    def = globalRegion.isMember(player);
-                }
-            }
-        }
-        
-        // The player argument is used if and only if the flag is the build
-        // flag -- in which case, if there are any regions in this area, we
-        // default to FALSE, otherwise true if there are no defined regions.
-        // However, other flags are different -- if there are regions defined,
-        // we default to the global region value. 
-        if (player == null) {
-            allowed = def; 
-        }
-        
-        int lastPriority = Integer.MIN_VALUE;
-
-        // The algorithm is as follows:
-        // While iterating through the list of regions, if an entry disallows
-        // the flag, then put it into the needsClear set. If an entry allows
-        // the flag and it has a parent, then its parent is put into hasCleared.
-        // In the situation that the child is reached before the parent, upon
-        // the parent being reached, even if the parent disallows, because the
-        // parent will be in hasCleared, permission will be allowed. In the
-        // other case, where the parent is reached first, if it does not allow
-        // permissions, it will be placed into needsClear. If a child of
-        // the parent is reached later, the parent will be removed from
-        // needsClear. At the end, if needsClear is not empty, that means that
-        // permission should not be given. If a parent has multiple children
-        // and one child does not allow permissions, then it will be placed into
-        // needsClear just like as if was a parent.
-
-        Set<ProtectedRegion> needsClear = new HashSet<ProtectedRegion>();
-        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
-
-        for (ProtectedRegion region : applicable) {
-            // Ignore lower priority regions
-            if (hasFlagDefined && region.getPriority() < lastPriority) {
-                break;
-            }
-
-            lastPriority = region.getPriority();
-
-            // Ignore non-build regions
-            if (player != null
-                    && region.getFlag(DefaultFlag.PASSTHROUGH) == State.ALLOW) {
-                continue;
-            }
-
-            // Check group permissions
-            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
-                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
-                if (group == null) {
-                    group = flag.getRegionGroupFlag().getDefault();
-                }
-                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
-                    continue;
-                }
-            }
-
-            State v = region.getFlag(flag);
-
-            // Allow DENY to override everything
-            if (v == State.DENY) {
-                return false;
-            }
-
-            // Forget about regions that allow it, although make sure the
-            // default state is now to allow
-            if (v == State.ALLOW) {
-                allowed = true;
-                found = true;
-                hasFlagDefined = true;
-                continue;
-            }
-
-            // For the build flag, the flags are conditional and are based
-            // on membership, so we have to check for parent-child
-            // relationships
-            if (player != null) {
-                hasFlagDefined = true;
-
-                if (hasCleared.contains(region)) {
-                    // Already cleared, so do nothing
-                } else {
-                    if (!region.isMember(player)) {
-                        needsClear.add(region);
-                    } else {
-                        // Need to clear all parents
-                        clearParents(needsClear, hasCleared, region);
-                    }
-                }
-            }
-
-            found = true;
-        }
-
-        return !found ? def :
-                (allowed || (player != null && needsClear.size() == 0));
-    }
-
-    /**
-     * Clear a region's parents for isFlagAllowed().
-     * 
-     * @param needsClear The regions that should be cleared
-     * @param hasCleared The regions already cleared
-     * @param region The region to start from
-     */
-    private void clearParents(Set<ProtectedRegion> needsClear,
-            Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
-        ProtectedRegion parent = region.getParent();
-
-        while (parent != null) {
-            if (!needsClear.remove(parent)) {
-                hasCleared.add(parent);
-            }
-
-            parent = parent.getParent();
-        }
-    }
-
-    /**
-     * @see #getFlag(com.sk89q.worldguard.protection.flags.Flag, com.sk89q.worldguard.LocalPlayer)
-     * @param flag flag to check
-     * @return value of the flag
-     */
-    public <T extends Flag<V>, V> V getFlag(T flag) {
-        return getFlag(flag, null);
-    }
-
-    /**
-     * 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
-     * @throws IllegalArgumentException if a StateFlag is given
-     */
-    public <T extends Flag<V>, V> V getFlag(T flag, LocalPlayer groupPlayer) {
-        /*
-        if (flag instanceof StateFlag) {
-            throw new IllegalArgumentException("Cannot use StateFlag with getFlag()");
-        }
-        */
-
-        int lastPriority = 0;
-        boolean found = false;
-
-        Map<ProtectedRegion, V> needsClear = new HashMap<ProtectedRegion, V>();
-        Set<ProtectedRegion> hasCleared = new HashSet<ProtectedRegion>();
-
-        for (ProtectedRegion region : applicable) {
-            // Ignore lower priority regions
-            if (found && region.getPriority() < lastPriority) {
-                break;
-            }
-
-            // Check group permissions
-            if (groupPlayer != null && flag.getRegionGroupFlag() != null) {
-                RegionGroup group = region.getFlag(flag.getRegionGroupFlag());
-                if (group == null) {
-                    group = flag.getRegionGroupFlag().getDefault();
-                }
-                if (!RegionGroupFlag.isMember(region, group, groupPlayer)) {
-                    continue;
-                }
-            }
-
-            if (hasCleared.contains(region)) {
-                // Already cleared, so do nothing
-            } else if (region.getFlag(flag) != null) {
-                clearParents(needsClear, hasCleared, region);
-
-                needsClear.put(region, region.getFlag(flag));
-
-                found = true;
-            }
-
-            lastPriority = region.getPriority();
-        }
-        
-        if (!needsClear.isEmpty()) {
-            return needsClear.values().iterator().next();
-        } else {
-            if (globalRegion != null) {
-                V gFlag = globalRegion.getFlag(flag);
-                if (gFlag != null) return gFlag;
-            }
-            return null;
-        }
-    }
-
-    /**
-     * Clear a region's parents for getFlag().
-     * 
-     * @param needsClear The regions that should be cleared
-     * @param hasCleared The regions already cleared
-     * @param region The region to start from
-     */
-    private void clearParents(Map<ProtectedRegion, ?> needsClear,
-            Set<ProtectedRegion> hasCleared, ProtectedRegion region) {
-        ProtectedRegion parent = region.getParent();
-
-        while (parent != null) {
-            if (needsClear.remove(parent) == null) {
-                hasCleared.add(parent);
-            }
-
-            parent = parent.getParent();
-        }
-    }
-    
-    /**
-     * Get the number of regions that are included.
-     * 
-     * @return the size of this ApplicbleRegionSet
-     */
-    public int size() {
-        return applicable.size();
-    }
-    
-    /**
-     * Get an iterator of affected regions.
-     */
-    public Iterator<ProtectedRegion> iterator() {
-        return applicable.iterator();
-    }
-}

src/main/java/com/sk89q/worldguard/protection/GlobalRegionManager.java

@@ -1,372 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.sk89q.worldguard.protection;
-
-import static com.sk89q.worldguard.bukkit.BukkitUtil.toVector;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
-import org.bukkit.Location;
-import org.bukkit.World;
-import org.bukkit.block.Block;
-import org.bukkit.entity.Player;
-
-import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.bukkit.BukkitUtil;
-import com.sk89q.worldguard.bukkit.ConfigurationManager;
-import com.sk89q.worldguard.bukkit.WorldConfiguration;
-import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
-import com.sk89q.worldguard.protection.databases.MySQLDatabase;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabase;
-import com.sk89q.worldguard.protection.databases.ProtectionDatabaseException;
-import com.sk89q.worldguard.protection.databases.YAMLDatabase;
-import com.sk89q.worldguard.protection.flags.StateFlag;
-import com.sk89q.worldguard.protection.managers.PRTreeRegionManager;
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-/**
- * This class keeps track of region information for every world. It loads
- * world region information as needed.
- *
- * @author sk89q
- * @author Redecouverte
- */
-public class GlobalRegionManager {
-
-    /**
-     * Reference to the plugin.
-     */
-    private WorldGuardPlugin plugin;
-
-    /**
-     * Reference to the global configuration.
-     */
-    private ConfigurationManager config;
-
-    /**
-     * Map of managers per-world.
-     */
-    private ConcurrentHashMap<String, RegionManager> managers;
-
-    /**
-     * Stores the list of modification dates for the world files. This allows
-     * WorldGuard to reload files as needed.
-     */
-    private HashMap<String, Long> lastModified;
-
-    /**
-     * Construct the object.
-     *
-     * @param plugin The plugin instance
-     */
-    public GlobalRegionManager(WorldGuardPlugin plugin) {
-        this.plugin = plugin;
-        config = plugin.getGlobalStateManager();
-        managers = new ConcurrentHashMap<String, RegionManager>();
-        lastModified = new HashMap<String, Long>();
-    }
-
-    /**
-     * Unload region information.
-     */
-    public void unload() {
-        managers.clear();
-        lastModified.clear();
-    }
-
-    /**
-     * Get the path for a world's regions file.
-     *
-     * @param name The name of the world
-     * @return The region file path for a world's region file
-     */
-    protected File getPath(String name) {
-        return new File(plugin.getDataFolder(),
-                "worlds" + File.separator + name + File.separator + "regions.yml");
-    }
-
-    /**
-     * Unload region information for a world.
-     *
-     * @param name The name of the world to unload
-     */
-    public void unload(String name) {
-        RegionManager manager = managers.remove(name);
-
-        if (manager != null) {
-            lastModified.remove(name);
-        }
-    }
-
-    /**
-     * Unload all region information.
-     */
-    public void unloadAll() {
-        managers.clear();
-        lastModified.clear();
-    }
-
-    public RegionManager load(World world) {
-        RegionManager manager = create(world);
-        managers.put(world.getName(), manager);
-        return manager;
-    }
-
-    /**
-     * Load region information for a world.
-     *
-     * @param world The world to load a RegionManager for
-     * @return the loaded RegionManager
-     */
-    public RegionManager create(World world) {
-        String name = world.getName();
-        boolean sql = config.useSqlDatabase;
-        ProtectionDatabase database;
-        File file = null;
-
-        try {
-            if (!sql) {
-                file = getPath(name);
-                database = new YAMLDatabase(file, plugin.getLogger());
-
-                // Store the last modification date so we can track changes
-                lastModified.put(name, file.lastModified());
-            } else {
-                database = new MySQLDatabase(config, name, plugin.getLogger());
-            }
-
-            // Create a manager
-            RegionManager manager = new PRTreeRegionManager(database);
-            manager.load();
-
-            if (plugin.getGlobalStateManager().get(world).summaryOnStart) {
-                plugin.getLogger().info(manager.getRegions().size()
-                        + " regions loaded for '" + name + "'");
-            }
-
-            return manager;
-        } catch (ProtectionDatabaseException e) {
-            String logStr = "Failed to load regions from ";
-            if (sql) {
-                logStr += "SQL Database <" + config.sqlDsn + "> ";
-            } else {
-                logStr += "file \"" + file + "\" ";
-            }
-
-            plugin.getLogger().log(Level.SEVERE, logStr + " : " + e.getMessage());
-            e.printStackTrace();
-        } catch (FileNotFoundException e) {
-            plugin.getLogger().log(Level.SEVERE, "Error loading regions for world \""
-                    + name + "\": " + e.toString() + "\n\t" + e.getMessage());
-            e.printStackTrace();
-        }
-
-        // @TODO: THIS CREATES PROBLEMS!!one!!1!!eleven!!1!!!
-        return null;
-    }
-
-    /**
-     * Preloads region managers for all worlds.
-     */
-    public void preload() {
-        // Load regions
-        for (World world : plugin.getServer().getWorlds()) {
-            load(world);
-        }
-    }
-
-    /**
-     * Reloads the region information from file when region databases
-     * have changed.
-     */
-    public void reloadChanged() {
-        if (config.useSqlDatabase) return;
-
-        for (String name : managers.keySet()) {
-            File file = getPath(name);
-
-            Long oldDate = lastModified.get(name);
-
-            if (oldDate == null) {
-                oldDate = 0L;
-            }
-
-            try {
-                if (file.lastModified() > oldDate) {
-                    World world = plugin.getServer().getWorld(name);
-
-                    if (world != null) {
-                        load(world);
-                    }
-                }
-            } catch (Exception ignore) {
-            }
-        }
-    }
-
-    /**
-     * Get the region manager for a particular world.
-     *
-     * @param world The world to get a RegionManager for
-     * @return The region manager.
-     */
-    public RegionManager get(World world) {
-        RegionManager manager = managers.get(world.getName());
-        RegionManager newManager = null;
-
-        while (manager == null) {
-            if (newManager == null) {
-                newManager = create(world);
-            }
-            managers.putIfAbsent(world.getName(), newManager);
-            manager = managers.get(world.getName());
-        }
-
-        return manager;
-    }
-
-    /**
-     * Returns whether the player can bypass.
-     *
-     * @param player The player to check
-     * @param world The world to check for
-     * @return Whether {@code player} has bypass permission for {@code world}
-     */
-    public boolean hasBypass(LocalPlayer player, World world) {
-        return player.hasPermission("worldguard.region.bypass."
-                        + world.getName());
-    }
-
-    /**
-     * Returns whether the player can bypass.
-     *
-     * @param player The player to check
-     * @param world The world to check
-     * @return Whether {@code player} has bypass permission for {@code world}
-     */
-    public boolean hasBypass(Player player, World world) {
-        return plugin.hasPermission(player, "worldguard.region.bypass."
-                + world.getName());
-    }
-
-    /**
-     * Check if a player has permission to build at a block.
-     *
-     * @param player The player to check
-     * @param block The block to check at
-     * @return Whether {@code player} can build at {@code block}'s location
-     */
-    public boolean canBuild(Player player, Block block) {
-        return canBuild(player, block.getLocation());
-    }
-
-    /**
-     * Check if a player has permission to build at a location.
-     *
-     * @param player The player to check
-     * @param loc The location to check
-     * @return Whether {@code player} can build at {@code loc}
-     */
-    public boolean canBuild(Player player, Location loc) {
-        World world = loc.getWorld();
-        WorldConfiguration worldConfig = config.get(world);
-
-        if (!worldConfig.useRegions) {
-            return true;
-        }
-
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-        if (!hasBypass(player, world)) {
-            RegionManager mgr = get(world);
-
-            if (!mgr.getApplicableRegions(BukkitUtil.toVector(loc))
-                    .canBuild(localPlayer)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    public boolean canConstruct(Player player, Block block) {
-        return canConstruct(player, block.getLocation());
-    }
-
-    public boolean canConstruct(Player player, Location loc) {
-        World world = loc.getWorld();
-        WorldConfiguration worldConfig = config.get(world);
-
-        if (!worldConfig.useRegions) {
-            return true;
-        }
-
-        LocalPlayer localPlayer = plugin.wrapPlayer(player);
-
-        if (!hasBypass(player, world)) {
-            RegionManager mgr = get(world);
-
-            final ApplicableRegionSet applicableRegions = mgr.getApplicableRegions(BukkitUtil.toVector(loc));
-            if (!applicableRegions.canBuild(localPlayer)) {
-                return false;
-            }
-            if (!applicableRegions.canConstruct(localPlayer)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks to see whether a flag is allowed.
-     *
-     * @see #allows(com.sk89q.worldguard.protection.flags.StateFlag, org.bukkit.Location, com.sk89q.worldguard.LocalPlayer)
-     * @param flag The flag to check
-     * @param loc The location to check the flag at
-     * @return Whether the flag is allowed
-     */
-    public boolean allows(StateFlag flag, Location loc) {
-        return allows(flag, loc, null);
-    }
-
-    /**
-     * Checks to see whether a flag is allowed.
-     *
-     * @param flag The flag to check
-     * @param loc The location to check the flag at
-     * @param player The player to check for the flag's {@link com.sk89q.worldguard.protection.flags.RegionGroup}
-     * @return Whether the flag is allowed
-     */
-    public boolean allows(StateFlag flag, Location loc, LocalPlayer player) {
-        World world = loc.getWorld();
-        WorldConfiguration worldConfig = config.get(world);
-
-        if (!worldConfig.useRegions) {
-            return true;
-        }
-
-        RegionManager mgr = get(world);
-        return mgr.getApplicableRegions(toVector(loc)).allows(flag, player);
-    }
-}

src/main/java/com/sk89q/worldguard/protection/UnsupportedIntersectionException.java

@@ -1,24 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection;
-
-public class UnsupportedIntersectionException extends Exception {
-    private static final long serialVersionUID = 6423189392345575148L;
-}

src/main/java/com/sk89q/worldguard/protection/databases/AbstractProtectionDatabase.java

@@ -1,46 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection.databases;
-
-import com.sk89q.worldguard.protection.managers.RegionManager;
-
-public abstract class AbstractProtectionDatabase implements ProtectionDatabase {
-
-    /**
-     * Load the list of regions into a region manager.
-     * 
-     * @throws ProtectionDatabaseException
-     */
-    public void load(RegionManager manager) throws ProtectionDatabaseException {
-        load();
-        manager.setRegions(getRegions());
-    }
-    
-    /**
-     * Save the list of regions from a region manager.
-     * 
-     * @throws ProtectionDatabaseException
-     */
-    public void save(RegionManager manager) throws ProtectionDatabaseException {
-        setRegions(manager.getRegions());
-        save();
-    }
-    
-}

src/main/java/com/sk89q/worldguard/protection/databases/CSVDatabase.java

@@ -1,357 +0,0 @@
-// $Id$
-/*
- * WorldGuard
- * Copyright (C) 2010 sk89q <http://www.sk89q.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-package com.sk89q.worldguard.protection.databases;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import au.com.bytecode.opencsv.CSVReader;
-
-import com.sk89q.worldedit.BlockVector;
-import com.sk89q.worldedit.Vector;
-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.flags.StateFlag.State;
-import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion.CircularInheritanceException;
-import com.sk89q.worldguard.util.ArrayReader;
-
-/**
- * Represents a protected area database that uses CSV files.
- *
- * @author sk89q
- */
-public class CSVDatabase extends AbstractProtectionDatabase {
-    
-    private static final Map<String, StateFlag> legacyFlagCodes = new HashMap<String, StateFlag>();
-    static {
-        legacyFlagCodes.put("z", DefaultFlag.PASSTHROUGH);
-        legacyFlagCodes.put("b", DefaultFlag.BUILD);
-        legacyFlagCodes.put("p", DefaultFlag.PVP);
-        legacyFlagCodes.put("m", DefaultFlag.MOB_DAMAGE);
-        legacyFlagCodes.put("c", DefaultFlag.CREEPER_EXPLOSION);
-        legacyFlagCodes.put("t", DefaultFlag.TNT);
-        legacyFlagCodes.put("l", DefaultFlag.LIGHTER);
-        legacyFlagCodes.put("f", DefaultFlag.FIRE_SPREAD);
-        legacyFlagCodes.put("F", DefaultFlag.LAVA_FIRE);
-        legacyFlagCodes.put("C", DefaultFlag.CHEST_ACCESS);
-    }
-
-    private final Logger logger;
-
-    /**
-     * References the CSV file.
-     */
-    private final File file;
-    /**
-     * Holds the list of regions.
-     */
-    private Map<String,ProtectedRegion> regions;
-
-    /**
-     * Construct the database with a path to a file. No file is read or
-     * written at this time.
-     *
-     * @param file The file in CSV format containing the region database
-     * @param logger The logger to log errors to
-     */
-    public CSVDatabase(File file, Logger logger) {
-        this.file = file;
-        this.logger = logger;
-    }
-
-    /**
-     * Saves the database.
-     */
-    public void save() throws ProtectionDatabaseException {
-        throw new UnsupportedOperationException("CSV format is no longer implemented");
-    }
-
-    public void load() throws ProtectionDatabaseException {
-        Map<String,ProtectedRegion> regions =
-                new HashMap<String,ProtectedRegion>();
-        Map<ProtectedRegion,String> parentSets =
-                new LinkedHashMap<ProtectedRegion, String>();
-
-        CSVReader reader = null;
-        try {
-            reader = new CSVReader(new FileReader(file));
-
-            String[] line;
-
-            while ((line = reader.readNext()) != null) {
-                if (line.length < 2) {
-                    logger.warning("Invalid region definition: " + line);
-                    continue;
-                }
-
-                String id = line[0].toLowerCase().replace(".", "");
-                String type = line[1];
-                ArrayReader<String> entries = new ArrayReader<String>(line);
-
-                if (type.equalsIgnoreCase("cuboid")) {
-                    if (line.length < 8) {
-                        logger.warning("Invalid region definition: " + line);
-                        continue;
-                    }
-
-                    Vector pt1 = new Vector(
-                            Integer.parseInt(line[2]),
-                            Integer.parseInt(line[3]),
-                            Integer.parseInt(line[4]));
-                    Vector pt2 = new Vector(
-                            Integer.parseInt(line[5]),
-                            Integer.parseInt(line[6]),
-                            Integer.parseInt(line[7]));
-
-                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
-                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
-
-                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
-                    String ownersData = entries.get(9);
-                    String flagsData = entries.get(10);
-                    //String enterMessage = nullEmptyString(entries.get(11));
-
-                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
-                    region.setPriority(priority);
-                    parseFlags(region, flagsData);
-                    region.setOwners(this.parseDomains(ownersData));
-                    regions.put(id, region);
-                } else if (type.equalsIgnoreCase("cuboid.2")) {
-                    Vector pt1 = new Vector(
-                            Integer.parseInt(line[2]),
-                            Integer.parseInt(line[3]),
-                            Integer.parseInt(line[4]));
-                    Vector pt2 = new Vector(
-                            Integer.parseInt(line[5]),
-                            Integer.parseInt(line[6]),
-                            Integer.parseInt(line[7]));
-
-                    BlockVector min = Vector.getMinimum(pt1, pt2).toBlockVector();
-                    BlockVector max = Vector.getMaximum(pt1, pt2).toBlockVector();
-
-                    int priority = entries.get(8) == null ? 0 : Integer.parseInt(entries.get(8));
-                    String parentId = entries.get(9);
-                    String ownersData = entries.get(10);
-                    String membersData = entries.get(11);
-                    String flagsData = entries.get(12);
-                    //String enterMessage = nullEmptyString(entries.get(13));
-                    //String leaveMessage = nullEmptyString(entries.get(14));
-
-                    ProtectedRegion region = new ProtectedCuboidRegion(id, min, max);
-                    region.setPriority(priority);
-                    parseFlags(region, flagsData);
-                    region.setOwners(this.parseDomains(ownersData));
-                    region.setMembers(this.parseDomains(membersData));
-                    regions.put(id, region);
-
-                    // Link children to parents later
-                    if (parentId.length() > 0) {
-                        parentSets.put(region, parentId);
-                    }
-                }
-            }
-        } catch (IOException e) {
-            throw new ProtectionDatabaseException(e);
-        } finally {
-            try {
-                reader.close();
-            } catch (IOException ignored) {
-            }
-        }
-
-        for (Map.Entry<ProtectedRegion, String> entry : parentSets.entrySet()) {
-            ProtectedRegion parent = regions.get(entry.getValue());
-            if (parent != null) {
-                try {
-                    entry.getKey().setParent(parent);
-                } catch (CircularInheritanceException e) {
-                    logger.warning("Circular inheritance detect with '"
-                            + entry.getValue() + "' detected as a parent");
-                }
-            } else {
-                logger.warning("Unknown region parent: " + entry.getValue());
-            }
-        }
-
-        this.regions = regions;
-    }
-
-    /**
-     * Used to parse the specified domain in the CSV file.
-     *
-     * @param data The domain data as a string
-     * @return The domain data as a DefaultDomain
-     */
-    private DefaultDomain parseDomains(String data) {
-        if (data == null) {
-            return new DefaultDomain();
-        }
-
-        DefaultDomain domain = new DefaultDomain();
-        Pattern pattern = Pattern.compile("^([A-Za-z]):(.*)$");
-
-        String[] parts = data.split(",");
-
-        for (String part : parts) {
-            if (part.trim().length() == 0) {
-                continue;
-            }
-
-            Matcher matcher = pattern.matcher(part);
-
-            if (!matcher.matches()) {
-                logger.warning("Invalid owner specification: " + part);
-                continue;
-            }
-
-            String type = matcher.group(1);
-            String id = matcher.group(2);
-
-            if (type.equals("u")) {
-                domain.addPlayer(id);
-            } else if (type.equals("g")) {
-                domain.addGroup(id);
-            } else {
-                logger.warning("Unknown owner specification: " + type);
-            }
-        }
-
-        return domain;
-    }
-
-    /**
-     * Used to parse the list of flags.
-     *
-     * @param data The flag data in string format
-     */
-    private void parseFlags(ProtectedRegion region, String data) {
-        if (data == null) {
-            return;
-        }
-
-        State curState = State.ALLOW;
-
-        for (int i = 0; i < data.length(); i++) {
-            char k = data.charAt(i);
-            if (k == '+') {
-                curState = State.ALLOW;
-            } else if (k == '-') {
-                curState = State.DENY;
-            } else {
-                String flagStr;
-                if (k == '_') {
-                    if (i == data.length() - 1) {
-                        logger.warning("_ read ahead fail");
-                        break;
-                    }
-                    flagStr = "_" + data.charAt(i + 1);
-                    i++;
-
-                    logger.warning("_? custom flags are no longer supported");
-                    continue;
-                } else {
-                    flagStr = String.valueOf(k);
-                }
-
-                StateFlag flag = legacyFlagCodes.get(flagStr);
-                if (flag != null) {
-                    region.setFlag(flag, curState);
-                } else {
-                    logger.warning("Legacy flag '" + flagStr + "' is unsupported");
-                }
-            }
-        }
-    }
-
-    /**
-     * Used to write the list of domains.
-     *
-     * @param domain
-     * @return
-     */
-/*    private String writeDomains(DefaultDomain domain) {
-        StringBuilder str = new StringBuilder();
-
-        for (String player : domain.getPlayers()) {
-            str.append("u:" + player + ",");
-        }
-
-        for (String group : domain.getGroups()) {
-            str.append("g:" + group + ",");
-        }
-
-        return str.length() > 0 ?
-                str.toString().substring(0, str.length() - 1) : "";
-    }*/
-
-    /**
-     * Helper method to prepend '+' or '-' in front of a flag according
-     * to the flag's state.
-     *
-     * @param state
-     * @param flag
-     * @return
-     */
-/*
-    private String writeFlag(State state, String flag) {
-        if (state == State.ALLOW) {
-            return "+" + flag;
-        } else if (state == State.DENY) {
-            return "-" + flag;
-        }
-
-        return "";
-    }
-*/
-
-    /**
-     * Returns a null if a string is null or empty.
-     *
-     * @param str The string to format
-     * @return null if the string is empty or null, otherwise the provided string
-     */
-    protected String nullEmptyString(String str) {
-        if (str == null) {
-            return null;
-        } else if (str.length() == 0) {
-            return null;
-        } else {
-            return str;
-        }
-    }
-
-    public Map<String,ProtectedRegion> getRegions() {
-        return regions;
-    }
-
-    public void setRegions(Map<String,ProtectedRegion> regions) {
-        this.regions = regions;
-    }
-}

src/main/java/com/sk89q/worldguard/protection/databases/InvalidTableFormatException.java

@@ -1,20 +0,0 @@
-package com.sk89q.worldguard.protection.databases;
-
-import com.sk89q.worldguard.util.FatalConfigurationLoadingException;
-
-public class InvalidTableFormatException extends FatalConfigurationLoadingException {
-	private static final long serialVersionUID = 1L;
-
-	protected String updateFile;
-
-    public InvalidTableFormatException(String updateFile) {
-        super();
-        
-        this.updateFile = updateFile;
-    }
-    
-    public String toString() {
-    	return "You need to update your database to the latest version.\n" +
-    			"\t\tPlease see " + this.updateFile;
-    }
-}