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

# Conflicts:
#	buildSrc/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

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 7.0.10
+
+* Add support for MC 1.20.5 and 1.20.6, drop support for other 1.20 versions
+
 ## 7.0.9
 * Add support for MC 1.20, drop support for MC 1.19
 * Made entities spawned via the `/summon` command get treated as plugin-spawned entities

COMPILING.md

@@ -1,11 +1,8 @@
 Compiling
 =========
 
-You can compile WorldGuard as long as you have some version of Java greater than or equal to 17 installed. Gradle will download JDK 17 specifically if needed,
-but it needs some version of Java to bootstrap from.
-
-Note that if you have JRE 17 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 16 and
-replace it with JDK 17.
+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:
 

buildSrc/build.gradle.kts

@@ -11,7 +11,19 @@ repositories {
 dependencies {
     implementation(gradleApi())
     implementation("gradle.plugin.org.cadixdev.gradle:licenser:0.6.1")
-    implementation("org.ajoberstar.grgit:grgit-gradle:4.1.1")
-    implementation("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
-    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.27.1")
-}
+    implementation("org.ajoberstar.grgit:grgit-gradle:5.2.2")
+    implementation("com.github.johnrengelman:shadow:8.1.1")
+    implementation("org.jfrog.buildinfo:build-info-extractor-gradle:5.2.0")
+    constraints {
+        val asmVersion = "[9.7,)"
+        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:[2.10,)") {
+            because("Need Java 21 support in shadow")
+        }
+    }
+}

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -25,7 +25,7 @@ fun Project.applyCommonConfiguration() {
 
     plugins.withId("java") {
         the<JavaPluginExtension>().toolchain {
-            languageVersion.set(JavaLanguageVersion.of(17))
+            languageVersion.set(JavaLanguageVersion.of(21))
         }
     }
 

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")
+    }
+}

buildSrc/src/main/kotlin/GradleExtras.kt

@@ -1,6 +1,6 @@
 import org.gradle.api.Project
 import org.gradle.api.plugins.ExtraPropertiesExtension
-import org.gradle.api.plugins.JavaPluginConvention
+import org.gradle.api.plugins.JavaPluginExtension
 import org.gradle.api.tasks.SourceSetContainer
 import org.gradle.kotlin.dsl.getByType
 import org.gradle.kotlin.dsl.the
@@ -9,4 +9,4 @@ val Project.ext: ExtraPropertiesExtension
     get() = extensions.getByType()
 
 val Project.sourceSets: SourceSetContainer
-    get() = the<JavaPluginConvention>().sourceSets
+    get() = the<JavaPluginExtension>().sourceSets

buildSrc/src/main/kotlin/LibsConfig.kt

@@ -1,6 +1,7 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.artifacts.ExternalModuleDependency
 import org.gradle.api.artifacts.ModuleDependency
 import org.gradle.api.attributes.Bundling
 import org.gradle.api.attributes.Category
@@ -52,22 +53,22 @@ fun Project.applyLibrariesConfiguration() {
     }
     val altConfigFiles = { artifactType: String ->
         val deps = configurations["shade"].incoming.dependencies
-                .filterIsInstance<ModuleDependency>()
-                .map { it.copy() }
-                .map { dependency ->
-                    dependency.artifact {
-                        name = dependency.name
-                        type = artifactType
-                        extension = "jar"
-                        classifier = artifactType
-                    }
-                    dependency
+            .filterIsInstance<ModuleDependency>()
+            .map { it.copy() }
+            .map { dependency ->
+                dependency.artifact {
+                    name = dependency.name
+                    type = artifactType
+                    extension = "jar"
+                    classifier = artifactType
                 }
+                dependency
+            }
 
         files(configurations.detachedConfiguration(*deps.toTypedArray())
-                .resolvedConfiguration.lenientConfiguration.artifacts
-                .filter { it.classifier == artifactType }
-                .map { zipTree(it.file) })
+            .resolvedConfiguration.lenientConfiguration.artifacts
+            .filter { it.classifier == artifactType }
+            .map { zipTree(it.file) })
     }
     tasks.register<Jar>("sourcesJar") {
         from({
@@ -161,11 +162,26 @@ fun Project.applyLibrariesConfiguration() {
     applyCommonArtifactoryConfig()
 }
 
+// A horrible hack because `softwareComponentFactory` has to be gotten via plugin
+// gradle why
 internal open class LibsConfigPluginHack @Inject constructor(
-        private val softwareComponentFactory: SoftwareComponentFactory
+    private val softwareComponentFactory: SoftwareComponentFactory
 ) : Plugin<Project> {
     override fun apply(project: Project) {
         val libsComponents = softwareComponentFactory.adhoc("libs")
         project.components.add(libsComponents)
     }
-}
+}
+
+fun Project.constrainDependenciesToLibsCore() {
+    evaluationDependsOn(":worldguard-libs:core")
+    val coreDeps = project(":worldguard-libs:core").configurations["shade"].dependencies
+        .filterIsInstance<ExternalModuleDependency>()
+    dependencies.constraints {
+        for (coreDep in coreDeps) {
+            add("shade", "${coreDep.group}:${coreDep.name}:${coreDep.version}") {
+                because("libs should align with libs:core")
+            }
+        }
+    }
+}

buildSrc/src/main/kotlin/PlatformConfig.kt

@@ -1,74 +1,27 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.gradle.api.Project
 import org.gradle.api.component.AdhocComponentWithVariants
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.plugins.quality.CheckstyleExtension
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
-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.named
 import org.gradle.kotlin.dsl.register
-import org.gradle.kotlin.dsl.withType
-import org.gradle.kotlin.dsl.the
 
-fun Project.applyPlatformAndCoreConfiguration() {
+fun Project.applyPlatformAndCoreConfiguration(javaRelease: Int = 17) {
     applyCommonConfiguration()
     apply(plugin = "java")
-    apply(plugin = "eclipse")
-    apply(plugin = "idea")
     apply(plugin = "maven-publish")
-    apply(plugin = "checkstyle")
     apply(plugin = "com.jfrog.artifactory")
+    applyCommonJavaConfiguration(
+        sourcesJar = true,
+        javaRelease = javaRelease,
+        banSlf4j = false
+    )
 
     ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
 
-    configure<CheckstyleExtension> {
-        configFile = rootProject.file("config/checkstyle/checkstyle.xml")
-        toolVersion = "10.3"
-    }
-
-    tasks.withType<Test>().configureEach {
-        useJUnitPlatform()
-    }
-
-    dependencies {
-        "compileOnly"("com.google.code.findbugs:jsr305:3.0.2")
-        "testCompileOnly"("com.google.code.findbugs:jsr305:3.0.2")
-        "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 as StandardJavadocDocletOptions).apply {
-            addStringOption("Xdoclint:none", "-quiet")
-            tags(
-                "apiNote:a:API Note:",
-                "implSpec:a:Implementation Requirements:",
-                "implNote:a:Implementation Note:"
-            )
-        }
-    }
-
-    the<JavaPluginExtension>().withJavadocJar()
-
-    if (name == "worldguard-core" || name == "worldguard-bukkit") {
-        the<JavaPluginExtension>().withSourcesJar()
-    }
-
-    tasks.named("check").configure {
-        dependsOn("checkstyleMain", "checkstyleTest")
-    }
-
     configure<PublishingExtension> {
         publications {
             register<MavenPublication>("maven") {
@@ -105,8 +58,10 @@ fun Project.applyShadowConfiguration() {
         exclude("GradleStart**")
         exclude(".cache")
         exclude("LICENSE*")
+        exclude("META-INF/maven/**")
     }
     val javaComponent = components["java"] as AdhocComponentWithVariants
+    // I don't think we want this published (it's the shadow jar)
     javaComponent.withVariantsFromConfiguration(configurations["shadowRuntimeElements"]) {
         skip()
     }

buildSrc/src/main/kotlin/Versions.kt

@@ -1,7 +1,7 @@
 object Versions {
     //    const val PISTON = "0.4.3"
     //    const val AUTO_VALUE = "1.6.5"
-    const val WORLDEDIT = "7.2.14"
+    const val WORLDEDIT = "7.3.0"
     const val JUNIT = "5.9.1"
     const val MOCKITO = "4.9.0"
     const val SQUIRRELID = "0.3.2"

gradle.properties

@@ -1,2 +1,2 @@
 group=com.sk89q.worldguard
-version=7.0.9
+version=7.1.0-SNAPSHOT

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    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.
@@ -141,7 +145,7 @@ 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ 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, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# 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" \

gradlew.bat

@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+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
 

worldguard-bukkit/build.gradle.kts

@@ -12,6 +12,11 @@ repositories {
         name = "paper"
         url = uri("https://repo.papermc.io/repository/maven-public/")
     }
+    maven {
+        // TODO: Remove this once paper updated to adventure release
+        name = "adventure-snapshots"
+        url = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+    }
 }
 
 configurations {
@@ -20,8 +25,8 @@ configurations {
 
 dependencies {
     "api"(project(":worldguard-core"))
-    "compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
-    "runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
+    "compileOnly"("io.papermc.paper:paper-api:1.20.6-R0.1-SNAPSHOT")
+    "runtimeOnly"("org.spigotmc:spigot-api:1.20.6-R0.1-SNAPSHOT") {
         exclude("junit", "junit")
     }
     "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/BukkitWorldGuardPlatform.java

@@ -266,7 +266,7 @@ public class BukkitWorldGuardPlatform implements WorldGuardPlatform {
                 if (radius > 0) {
                     BlockVector3 spawnLoc = BukkitAdapter.asBlockVector(bWorld.getSpawnLocation());
                     return new ProtectedCuboidRegion("__spawn_protection__",
-                            spawnLoc.subtract(radius, 0, radius).withY(world.getMinimumPoint().getY()),
+                            spawnLoc.subtract(radius, 0, radius).withY(world.getMinimumPoint().y()),
                             spawnLoc.add(radius, 0, radius).withY(world.getMaxY()));
                 }
             }

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

@@ -65,6 +65,7 @@ import com.sk89q.worldguard.bukkit.util.Events;
 import com.sk89q.worldguard.commands.GeneralCommands;
 import com.sk89q.worldguard.commands.ProtectionCommands;
 import com.sk89q.worldguard.commands.ToggleCommands;
+import com.sk89q.worldguard.domains.registry.SimpleDomainRegistry;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.registry.SimpleFlagRegistry;
@@ -212,6 +213,7 @@ public class WorldGuardPlugin extends JavaPlugin {
         });
 
         ((SimpleFlagRegistry) WorldGuard.getInstance().getFlagRegistry()).setInitialized(true);
+        ((SimpleDomainRegistry) WorldGuard.getInstance().getDomainRegistry()).setInitialized(true);
 
         // Enable metrics
         final Metrics metrics = new Metrics(this, BSTATS_PLUGIN_ID); // bStats plugin id

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/BlockedPotionsListener.java

@@ -35,6 +35,10 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;
 import org.bukkit.potion.PotionEffectType;
+import org.bukkit.potion.PotionType;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * Handles blocked potions.
@@ -50,43 +54,50 @@ public class BlockedPotionsListener extends AbstractListener {
         super(plugin);
     }
 
+    private PotionEffectType getBlockedEffectByArrow(Arrow arrow, BukkitWorldConfiguration wcfg) {
+        List<PotionEffect> effects = new ArrayList<>();
+        PotionType potionType = arrow.getBasePotionType();
+        if (potionType != null) {
+            effects.addAll(potionType.getPotionEffects());
+        }
+        effects.addAll(arrow.getCustomEffects());
+        for (PotionEffect potionEffect : effects) {
+            if (wcfg.blockPotions.contains(potionEffect.getType())) {
+                return potionEffect.getType();
+            }
+        }
+        return null;
+    }
+
+
     @EventHandler
     public void onProjectile(DamageEntityEvent event) {
-        if (event.getOriginalEvent() instanceof EntityDamageByEntityEvent) {
-            EntityDamageByEntityEvent originalEvent = (EntityDamageByEntityEvent) event.getOriginalEvent();
-            if (Entities.isPotionArrow(originalEvent.getDamager())) { // should take care of backcompat
-                BukkitWorldConfiguration wcfg = getWorldConfig(event.getWorld());
-                PotionEffectType blockedEffect = null;
-                if (originalEvent.getDamager() instanceof SpectralArrow) {
-                    if (wcfg.blockPotions.contains(PotionEffectType.GLOWING)) {
-                        blockedEffect = PotionEffectType.GLOWING;
-                    }
-                } else if (originalEvent.getDamager() instanceof Arrow) {
-                    Arrow tippedArrow = (Arrow) originalEvent.getDamager();
-                    PotionEffectType baseEffect = tippedArrow.getBasePotionData().getType().getEffectType();
-                    if (wcfg.blockPotions.contains(baseEffect)) {
-                        blockedEffect = baseEffect;
-                    } else {
-                        for (PotionEffect potionEffect : tippedArrow.getCustomEffects()) {
-                            if (wcfg.blockPotions.contains(potionEffect.getType())) {
-                                blockedEffect = potionEffect.getType();
-                                break;
-                            }
-                        }
-                    }
-                }
-                if (blockedEffect != null) {
-                    Player player = event.getCause().getFirstPlayer();
-                    if (player != null) {
-                        if (getPlugin().hasPermission(player, "worldguard.override.potions")) {
-                            return;
-                        }
-                        player.sendMessage(ChatColor.RED + "Sorry, arrows with "
-                                + blockedEffect.getName() + " are presently disabled.");
-                    }
-                    event.setCancelled(true);
-                }
+        if (!(event.getOriginalEvent() instanceof EntityDamageByEntityEvent originalEvent)) {
+            return;
+        }
+        if (!Entities.isPotionArrow(originalEvent.getDamager())) {
+            return;
+        }
+
+        BukkitWorldConfiguration wcfg = getWorldConfig(event.getWorld());
+        PotionEffectType blockedEffect = null;
+        if (originalEvent.getDamager() instanceof SpectralArrow) {
+            if (wcfg.blockPotions.contains(PotionEffectType.GLOWING)) {
+                blockedEffect = PotionEffectType.GLOWING;
             }
+        } else if (originalEvent.getDamager() instanceof Arrow arrow) {
+            blockedEffect = getBlockedEffectByArrow(arrow, wcfg);
+        }
+        if (blockedEffect != null) {
+            Player player = event.getCause().getFirstPlayer();
+            if (player != null) {
+                if (getPlugin().hasPermission(player, "worldguard.override.potions")) {
+                    return;
+                }
+                player.sendMessage(ChatColor.RED + "Sorry, arrows with "
+                        + blockedEffect.getName() + " are presently disabled.");
+            }
+            event.setCancelled(true);
         }
     }
 
@@ -104,25 +115,20 @@ public class BlockedPotionsListener extends AbstractListener {
         if (!wcfg.blockPotions.isEmpty()) {
             PotionEffectType blockedEffect = null;
 
-            PotionMeta meta;
-            if (item.getItemMeta() instanceof PotionMeta) {
-                meta = ((PotionMeta) item.getItemMeta());
-            } else {
-                return; // ok...?
+            if (!(item.getItemMeta() instanceof PotionMeta meta)) {
+                return;
             }
 
             // Find the first blocked effect
-            PotionEffectType baseEffect = meta.getBasePotionData().getType().getEffectType();
-            if (wcfg.blockPotions.contains(baseEffect)) {
-                blockedEffect = baseEffect;
+            List<PotionEffect> effects = new ArrayList<>();
+            if (meta.getBasePotionType() != null) {
+                effects.addAll(meta.getBasePotionType().getPotionEffects());
             }
-
-            if (blockedEffect == null && meta.hasCustomEffects()) {
-                for (PotionEffect effect : meta.getCustomEffects()) {
-                    if (wcfg.blockPotions.contains(effect.getType())) {
-                        blockedEffect = effect.getType();
-                        break;
-                    }
+            effects.addAll(meta.getCustomEffects());
+            for (PotionEffect potionEffect : effects) {
+                if (wcfg.blockPotions.contains(potionEffect.getType())) {
+                    blockedEffect = potionEffect.getType();
+                    break;
                 }
             }
 

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java

@@ -47,6 +47,7 @@ import com.sk89q.worldguard.bukkit.util.Materials;
 import com.sk89q.worldguard.config.WorldConfiguration;
 import com.sk89q.worldguard.protection.flags.Flags;
 import io.papermc.lib.PaperLib;
+import io.papermc.paper.event.player.PlayerOpenSignEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.Effect;
 import org.bukkit.GameMode;
@@ -145,7 +146,6 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.potion.PotionEffect;
-import org.bukkit.potion.PotionEffectType;
 import org.bukkit.projectiles.ProjectileSource;
 import org.bukkit.util.Vector;
 
@@ -482,7 +482,7 @@ public class EventAbstractionListener extends AbstractListener {
                         firedEvent.setSilent(true);
                     }
                     interactDebounce.debounce(clicked, event.getPlayer(), event, firedEvent);
-                    if (event.useInteractedBlock() == Result.DENY) {
+                    if (event.useInteractedBlock() == Result.DENY && !firedEvent.isSilent()) {
                         playDenyEffect(player, clicked.getLocation().add(0, 1, 0));
                     }
                 }
@@ -1086,9 +1086,9 @@ public class EventAbstractionListener extends AbstractListener {
     public void onLingeringApply(AreaEffectCloudApplyEvent event) {
         AreaEffectCloud entity = event.getEntity();
         List<PotionEffect> effects = new ArrayList<>();
-        PotionEffectType baseEffectType = entity.getBasePotionData().getType().getEffectType();
-        if (baseEffectType != null) {
-            effects.add(new PotionEffect(baseEffectType, 0, 0));
+        List<PotionEffect> baseEffectTypes = entity.getBasePotionType() == null ? null : entity.getBasePotionType().getPotionEffects();
+        if (baseEffectTypes != null) {
+            effects.addAll(baseEffectTypes);
         }
         if (entity.hasCustomEffects()) {
             effects.addAll(entity.getCustomEffects());
@@ -1173,7 +1173,7 @@ public class EventAbstractionListener extends AbstractListener {
 
         if (item != null && item.getType() == Material.END_CRYSTAL) { /*&& placed.getType() == Material.BEDROCK) {*/ // in vanilla you can only place them on bedrock but who knows what plugins will add
                                                                                                                         // may be overprotective as a result, but better than being underprotective
-            Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), EntityType.ENDER_CRYSTAL));
+            Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), EntityType.END_CRYSTAL));
             return;
         }
 
@@ -1266,5 +1266,13 @@ public class EventAbstractionListener extends AbstractListener {
         public void onEntityTransform(EntityZapEvent event) {
             Events.fireToCancel(event, new DamageEntityEvent(event, create(event.getBolt()), event.getEntity()));
         }
+
+        @EventHandler(ignoreCancelled = true)
+        public void onSignOpen(PlayerOpenSignEvent event) {
+            if (event.getCause() == PlayerOpenSignEvent.Cause.INTERACT) {
+                // other cases are handled by other events
+                Events.fireToCancel(event, new UseBlockEvent(event, create(event.getPlayer()), event.getSign().getBlock()));
+            }
+        }
     }
 }

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/PlayerMoveListener.java

@@ -25,7 +25,6 @@ import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.session.MoveType;
 import com.sk89q.worldguard.session.Session;
-import io.papermc.lib.PaperLib;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.AbstractHorse;
@@ -34,14 +33,13 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityMountEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.util.Vector;
-import org.spigotmc.event.entity.EntityMountEvent;
 
 public class PlayerMoveListener extends AbstractListener {
 
@@ -54,13 +52,10 @@ public class PlayerMoveListener extends AbstractListener {
         if (WorldGuard.getInstance().getPlatform().getGlobalStateManager().usePlayerMove) {
             PluginManager pm = getPlugin().getServer().getPluginManager();
             pm.registerEvents(this, getPlugin());
-            if (PaperLib.isSpigot()) {
-                pm.registerEvents(new EntityMountListener(), getPlugin());
-            }
         }
     }
 
-    @EventHandler
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         LocalPlayer player = getPlugin().wrapPlayer(event.getPlayer());
 
@@ -152,16 +147,14 @@ public class PlayerMoveListener extends AbstractListener {
         session.uninitialize(localPlayer);
     }
 
-    private class EntityMountListener implements Listener {
-        @EventHandler
-        public void onEntityMount(EntityMountEvent event) {
-            Entity entity = event.getEntity();
-            if (entity instanceof Player) {
-                LocalPlayer player = getPlugin().wrapPlayer((Player) entity);
-                Session session = WorldGuard.getInstance().getPlatform().getSessionManager().get(player);
-                if (null != session.testMoveTo(player, BukkitAdapter.adapt(event.getMount().getLocation()), MoveType.EMBARK, true)) {
-                    event.setCancelled(true);
-                }
+    @EventHandler
+    public void onEntityMount(EntityMountEvent event) {
+        Entity entity = event.getEntity();
+        if (entity instanceof Player) {
+            LocalPlayer player = getPlugin().wrapPlayer((Player) entity);
+            Session session = WorldGuard.getInstance().getPlatform().getSessionManager().get(player);
+            if (null != session.testMoveTo(player, BukkitAdapter.adapt(event.getMount().getLocation()), MoveType.EMBARK, true)) {
+                event.setCancelled(true);
             }
         }
     }

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionFlagsListener.java

@@ -69,7 +69,7 @@ public class RegionFlagsListener extends AbstractListener {
             }
         }
 
-        if (event.getCause().find(EntityType.SNOWMAN) != null) {
+        if (event.getCause().find(EntityType.SNOW_GOLEM) != null) {
             event.filter(testState(query, Flags.SNOWMAN_TRAILS), false);
         }
 
@@ -100,7 +100,7 @@ public class RegionFlagsListener extends AbstractListener {
             event.filter(testState(query, Flags.ENDERDRAGON_BLOCK_DAMAGE), config.explosionFlagCancellation);
         }
 
-        if (event.getCause().find(EntityType.ENDER_CRYSTAL) != null) { // EnderCrystal
+        if (event.getCause().find(EntityType.END_CRYSTAL) != null) { // EnderCrystal
             event.filter(testState(query, Flags.OTHER_EXPLOSION), config.explosionFlagCancellation);
         }
 

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java

@@ -218,7 +218,7 @@ public class RegionProtectionListener extends AbstractListener {
                 String what;
 
                 /* TNT */
-                if (event.getCause().find(EntityType.PRIMED_TNT, EntityType.MINECART_TNT) != null) {
+                if (event.getCause().find(EntityType.TNT, EntityType.TNT_MINECART) != null) {
                     canBreak = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.BLOCK_BREAK, Flags.TNT));
                     what = "use dynamite";
 

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java

@@ -586,8 +586,8 @@ public class WorldGuardEntityListener extends AbstractListener {
                 event.setCancelled(true);
                 return;
             }
-        } else if (event.getEntityType() == EntityType.PRIMED_TNT
-                || event.getEntityType() == EntityType.MINECART_TNT) {
+        } else if (event.getEntityType() == EntityType.TNT
+                || event.getEntityType() == EntityType.TNT_MINECART) {
             if (wcfg.blockTNTExplosions) {
                 event.setCancelled(true);
                 return;

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/debounce/legacy/InventoryMoveItemEventDebounce.java

@@ -54,7 +54,7 @@ public class InventoryMoveItemEventDebounce extends AbstractEventDebounce<Key> {
             if (holder instanceof BlockState blockState) {
                 return new BlockMaterialKey(blockState);
             } else if (holder instanceof DoubleChest doubleChest) {
-                InventoryHolder left = doubleChest.getLeftSide();
+                InventoryHolder left = PaperLib.isPaper() ? doubleChest.getLeftSide(false) : doubleChest.getLeftSide();
                 if (left instanceof Chest chest) {
                     return new BlockMaterialKey(chest);
                 } else {

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java

@@ -127,8 +127,8 @@ public final class Entities {
      */
     public static boolean isMinecart(EntityType type) {
         return switch(type) {
-            case MINECART, MINECART_CHEST, MINECART_COMMAND, MINECART_FURNACE,
-                    MINECART_HOPPER, MINECART_MOB_SPAWNER, MINECART_TNT -> true;
+            case MINECART, CHEST_MINECART, COMMAND_BLOCK_MINECART, FURNACE_MINECART,
+                 HOPPER_MINECART, SPAWNER_MINECART, TNT_MINECART -> true;
             default -> false;
         };
     }

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java

@@ -56,7 +56,6 @@ public final class Materials {
         if (tag == null) return;
         tag.getValues().forEach(mat -> MATERIAL_FLAGS.put(mat, value));
     }
-    private static Tag<Material> SIGNS_TAG = Tag.SIGNS;
 
     static {
         ENTITY_ITEMS.put(EntityType.PAINTING, Material.PAINTING);
@@ -64,22 +63,22 @@ public final class Materials {
         ENTITY_ITEMS.put(EntityType.SNOWBALL, Material.SNOWBALL);
         ENTITY_ITEMS.put(EntityType.FIREBALL, Material.FIRE_CHARGE);
         ENTITY_ITEMS.put(EntityType.ENDER_PEARL, Material.ENDER_PEARL);
-        ENTITY_ITEMS.put(EntityType.THROWN_EXP_BOTTLE, Material.EXPERIENCE_BOTTLE);
+        ENTITY_ITEMS.put(EntityType.EXPERIENCE_BOTTLE, Material.EXPERIENCE_BOTTLE);
         ENTITY_ITEMS.put(EntityType.ITEM_FRAME, Material.ITEM_FRAME);
         ENTITY_ITEMS.put(EntityType.GLOW_ITEM_FRAME, Material.GLOW_ITEM_FRAME);
-        ENTITY_ITEMS.put(EntityType.PRIMED_TNT, Material.TNT);
-        ENTITY_ITEMS.put(EntityType.FIREWORK, Material.FIREWORK_ROCKET);
-        ENTITY_ITEMS.put(EntityType.MINECART_COMMAND, Material.COMMAND_BLOCK_MINECART);
+        ENTITY_ITEMS.put(EntityType.TNT, Material.TNT);
+        ENTITY_ITEMS.put(EntityType.FIREWORK_ROCKET, Material.FIREWORK_ROCKET);
+        ENTITY_ITEMS.put(EntityType.COMMAND_BLOCK_MINECART, Material.COMMAND_BLOCK_MINECART);
         ENTITY_ITEMS.put(EntityType.BOAT, Material.OAK_BOAT);
         ENTITY_ITEMS.put(EntityType.MINECART, Material.MINECART);
-        ENTITY_ITEMS.put(EntityType.MINECART_CHEST, Material.CHEST_MINECART);
-        ENTITY_ITEMS.put(EntityType.MINECART_FURNACE, Material.FURNACE_MINECART);
-        ENTITY_ITEMS.put(EntityType.MINECART_TNT, Material.TNT_MINECART);
-        ENTITY_ITEMS.put(EntityType.MINECART_HOPPER, Material.HOPPER_MINECART);
-        ENTITY_ITEMS.put(EntityType.SPLASH_POTION, Material.POTION);
+        ENTITY_ITEMS.put(EntityType.CHEST_MINECART, Material.CHEST_MINECART);
+        ENTITY_ITEMS.put(EntityType.FURNACE_MINECART, Material.FURNACE_MINECART);
+        ENTITY_ITEMS.put(EntityType.TNT_MINECART, Material.TNT_MINECART);
+        ENTITY_ITEMS.put(EntityType.HOPPER_MINECART, Material.HOPPER_MINECART);
+        ENTITY_ITEMS.put(EntityType.POTION, Material.POTION);
         ENTITY_ITEMS.put(EntityType.EGG, Material.EGG);
         ENTITY_ITEMS.put(EntityType.ARMOR_STAND, Material.ARMOR_STAND);
-        ENTITY_ITEMS.put(EntityType.ENDER_CRYSTAL, Material.END_CRYSTAL);
+        ENTITY_ITEMS.put(EntityType.END_CRYSTAL, Material.END_CRYSTAL);
 
         MATERIAL_FLAGS.put(Material.AIR, 0);
         MATERIAL_FLAGS.put(Material.STONE, 0);
@@ -101,7 +100,7 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.DETECTOR_RAIL, 0);
         MATERIAL_FLAGS.put(Material.STICKY_PISTON, 0);
         MATERIAL_FLAGS.put(Material.COBWEB, 0);
-        MATERIAL_FLAGS.put(Material.GRASS, 0);
+        MATERIAL_FLAGS.put(Material.SHORT_GRASS, 0);
         MATERIAL_FLAGS.put(Material.DEAD_BUSH, 0);
         MATERIAL_FLAGS.put(Material.PISTON, 0);
         MATERIAL_FLAGS.put(Material.PISTON_HEAD, 0);
@@ -642,7 +641,7 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.PUFFERFISH_BUCKET, 0);
         MATERIAL_FLAGS.put(Material.SALMON, 0);
         MATERIAL_FLAGS.put(Material.SALMON_BUCKET, 0);
-        MATERIAL_FLAGS.put(Material.SCUTE, 0);
+        MATERIAL_FLAGS.put(Material.TURTLE_SCUTE, 0);
         MATERIAL_FLAGS.put(Material.SPLASH_POTION, 0);
         MATERIAL_FLAGS.put(Material.TURTLE_HELMET, 0);
         MATERIAL_FLAGS.put(Material.TRIDENT, 0);
@@ -821,31 +820,28 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.ECHO_SHARD, 0);
         MATERIAL_FLAGS.put(Material.REINFORCED_DEEPSLATE, 0);
 
-        // 1.20
-        try {
-            SIGNS_TAG = Tag.ALL_SIGNS;
+        MATERIAL_FLAGS.put(Material.BAMBOO_MOSAIC, 0);
+        MATERIAL_FLAGS.put(Material.BAMBOO_BLOCK, 0);
+        MATERIAL_FLAGS.put(Material.STRIPPED_BAMBOO_BLOCK, 0);
+        MATERIAL_FLAGS.put(Material.SUSPICIOUS_SAND, 0);
+        MATERIAL_FLAGS.put(Material.SUSPICIOUS_GRAVEL, 0);
+        MATERIAL_FLAGS.put(Material.PITCHER_PLANT, 0);
+        MATERIAL_FLAGS.put(Material.CHISELED_BOOKSHELF, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.DECORATED_POT, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.BRUSH, 0);
+        MATERIAL_FLAGS.put(Material.SNIFFER_EGG, 0);
+        MATERIAL_FLAGS.put(Material.CALIBRATED_SCULK_SENSOR, 0);
+        MATERIAL_FLAGS.put(Material.PIGLIN_HEAD, 0);
+        MATERIAL_FLAGS.put(Material.PIGLIN_WALL_HEAD, 0);
+        MATERIAL_FLAGS.put(Material.TORCHFLOWER_SEEDS, 0);
+        MATERIAL_FLAGS.put(Material.TORCHFLOWER_CROP, 0);
+        MATERIAL_FLAGS.put(Material.PITCHER_CROP, 0);
+        MATERIAL_FLAGS.put(Material.PINK_PETALS, 0);
+        MATERIAL_FLAGS.put(Material.PITCHER_POD, 0);
+        MATERIAL_FLAGS.put(Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0);
 
-            MATERIAL_FLAGS.put(Material.BAMBOO_MOSAIC, 0);
-            MATERIAL_FLAGS.put(Material.BAMBOO_BLOCK, 0);
-            MATERIAL_FLAGS.put(Material.STRIPPED_BAMBOO_BLOCK, 0);
-            MATERIAL_FLAGS.put(Material.SUSPICIOUS_SAND, 0);
-            MATERIAL_FLAGS.put(Material.SUSPICIOUS_GRAVEL, 0);
-            MATERIAL_FLAGS.put(Material.PITCHER_PLANT, 0);
-            MATERIAL_FLAGS.put(Material.CHISELED_BOOKSHELF, MODIFIED_ON_RIGHT);
-            MATERIAL_FLAGS.put(Material.DECORATED_POT, MODIFIED_ON_RIGHT);
-            MATERIAL_FLAGS.put(Material.BRUSH, 0);
-            MATERIAL_FLAGS.put(Material.SNIFFER_EGG, 0);
-            MATERIAL_FLAGS.put(Material.CALIBRATED_SCULK_SENSOR, 0);
-            MATERIAL_FLAGS.put(Material.PIGLIN_HEAD, 0);
-            MATERIAL_FLAGS.put(Material.PIGLIN_WALL_HEAD, 0);
-            MATERIAL_FLAGS.put(Material.TORCHFLOWER_SEEDS, 0);
-            MATERIAL_FLAGS.put(Material.TORCHFLOWER_CROP, 0);
-            MATERIAL_FLAGS.put(Material.PITCHER_CROP, 0);
-            MATERIAL_FLAGS.put(Material.PINK_PETALS, 0);
-            MATERIAL_FLAGS.put(Material.PITCHER_POD, 0);
-            MATERIAL_FLAGS.put(Material.NETHERITE_UPGRADE_SMITHING_TEMPLATE, 0);
-        } catch (NoSuchFieldError ignored) {
-        }
+        MATERIAL_FLAGS.put(Material.ARMADILLO_SCUTE, 0);
+        MATERIAL_FLAGS.put(Material.WOLF_ARMOR, 0);
 
         // Generated via tag
         putMaterialTag(Tag.WOODEN_DOORS, MODIFIED_ON_RIGHT);
@@ -865,7 +861,7 @@ public final class Materials {
         putMaterialTag(Tag.BUTTONS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.FLOWER_POTS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.WALLS, 0);
-        putMaterialTag(SIGNS_TAG, 0);
+        putMaterialTag(Tag.ALL_SIGNS, 0);
         putMaterialTag(Tag.SMALL_FLOWERS, 0);
         putMaterialTag(Tag.BEDS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.ITEMS_MUSIC_DISCS, 0);
@@ -884,12 +880,10 @@ public final class Materials {
         putMaterialTag(Tag.CANDLES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.CANDLE_CAKES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.CAULDRONS, MODIFIED_ON_RIGHT);
-        try {
-            // 1.20
-            putMaterialTag(Tag.ITEMS_TRIM_TEMPLATES, 0);
-            putMaterialTag(Tag.ITEMS_DECORATED_POT_SHERDS, 0);
-        } catch (NoSuchFieldError ignored) {
-        }
+
+        // 1.20
+        putMaterialTag(Tag.ITEMS_TRIM_TEMPLATES, 0);
+        putMaterialTag(Tag.ITEMS_DECORATED_POT_SHERDS, 0);
 
         Stream.concat(Stream.concat(
                 Tag.CORAL_BLOCKS.getValues().stream(),
@@ -915,14 +909,14 @@ public final class Materials {
         }
 
 //        DAMAGE_EFFECTS.add(PotionEffectType.SPEED);
-        DAMAGE_EFFECTS.add(PotionEffectType.SLOW);
+        DAMAGE_EFFECTS.add(PotionEffectType.SLOWNESS);
 //        DAMAGE_EFFECTS.add(PotionEffectType.FAST_DIGGING);
-        DAMAGE_EFFECTS.add(PotionEffectType.SLOW_DIGGING);
+        DAMAGE_EFFECTS.add(PotionEffectType.MINING_FATIGUE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.INCREASE_DAMAGE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.HEAL);
-        DAMAGE_EFFECTS.add(PotionEffectType.HARM);
+        DAMAGE_EFFECTS.add(PotionEffectType.INSTANT_DAMAGE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.JUMP);
-        DAMAGE_EFFECTS.add(PotionEffectType.CONFUSION);
+        DAMAGE_EFFECTS.add(PotionEffectType.NAUSEA);
 //        DAMAGE_EFFECTS.add(PotionEffectType.REGENERATION);
 //        DAMAGE_EFFECTS.add(PotionEffectType.DAMAGE_RESISTANCE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.FIRE_RESISTANCE);
@@ -988,13 +982,11 @@ public final class Materials {
      * @return the block material
      */
     public static Material getBucketBlockMaterial(Material type) {
-        switch (type) {
-            case LAVA_BUCKET:
-                return Material.LAVA;
-            case WATER_BUCKET:
-            default:
-                return Material.WATER;
-        }
+        return switch (type) {
+            case LAVA_BUCKET -> Material.LAVA;
+            case WATER_BUCKET -> Material.WATER;
+            default -> Material.WATER;
+        };
     }
 
     /**
@@ -1146,6 +1138,7 @@ public final class Materials {
     public static EntityType getEntitySpawnEgg(Material material) {
         return switch (material) {
             case ALLAY_SPAWN_EGG -> EntityType.ALLAY;
+            case ARMADILLO_SPAWN_EGG -> EntityType.ARMADILLO;
             case AXOLOTL_SPAWN_EGG -> EntityType.AXOLOTL;
             case SPIDER_SPAWN_EGG -> EntityType.SPIDER;
             case BAT_SPAWN_EGG -> EntityType.BAT;
@@ -1178,7 +1171,7 @@ public final class Materials {
             case IRON_GOLEM_SPAWN_EGG -> EntityType.IRON_GOLEM;
             case LLAMA_SPAWN_EGG -> EntityType.LLAMA;
             case MAGMA_CUBE_SPAWN_EGG -> EntityType.MAGMA_CUBE;
-            case MOOSHROOM_SPAWN_EGG -> EntityType.MUSHROOM_COW;
+            case MOOSHROOM_SPAWN_EGG -> EntityType.MOOSHROOM;
             case MULE_SPAWN_EGG -> EntityType.MULE;
             case OCELOT_SPAWN_EGG -> EntityType.OCELOT;
             case PANDA_SPAWN_EGG -> EntityType.PANDA;
@@ -1199,7 +1192,7 @@ public final class Materials {
             case SKELETON_SPAWN_EGG -> EntityType.SKELETON;
             case SLIME_SPAWN_EGG -> EntityType.SLIME;
             case SNIFFER_SPAWN_EGG -> EntityType.SNIFFER;
-            case SNOW_GOLEM_SPAWN_EGG -> EntityType.SNOWMAN;
+            case SNOW_GOLEM_SPAWN_EGG -> EntityType.SNOW_GOLEM;
             case SQUID_SPAWN_EGG -> EntityType.SQUID;
             case STRAY_SPAWN_EGG -> EntityType.STRAY;
             case STRIDER_SPAWN_EGG -> EntityType.STRIDER;
@@ -1343,7 +1336,8 @@ public final class Materials {
             || type == Material.DRAGON_EGG
             || Tag.FLOWER_POTS.isTagged(type)
             || Tag.CANDLES.isTagged(type)
-            || Tag.CANDLE_CAKES.isTagged(type);
+            || Tag.CANDLE_CAKES.isTagged(type)
+            || Tag.ALL_SIGNS.isTagged(type);
     }
 
     /**
@@ -1456,9 +1450,9 @@ public final class Materials {
             case YELLOW_DYE:
             case GLOW_INK_SAC:
             case INK_SAC:
-                return SIGNS_TAG.isTagged(targetMaterial);
+                return Tag.ALL_SIGNS.isTagged(targetMaterial);
             case HONEYCOMB:
-                return isUnwaxedCopper(targetMaterial) || SIGNS_TAG.isTagged(targetMaterial);
+                return isUnwaxedCopper(targetMaterial) || Tag.ALL_SIGNS.isTagged(targetMaterial);
             case BRUSH:
                 return switch (targetMaterial) {
                     case SUSPICIOUS_GRAVEL, SUSPICIOUS_SAND -> true;

worldguard-core/src/main/java/com/sk89q/worldguard/WorldGuard.java

@@ -24,6 +24,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.worldguard.domains.registry.DomainRegistry;
+import com.sk89q.worldguard.domains.registry.SimpleDomainRegistry;
 import com.sk89q.worldguard.util.profile.cache.HashMapCache;
 import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldguard.util.profile.cache.SQLiteCache;
@@ -55,6 +57,7 @@ public final class WorldGuard {
 
     private WorldGuardPlatform platform;
     private final SimpleFlagRegistry flagRegistry = new SimpleFlagRegistry();
+    private final SimpleDomainRegistry domainRegistry = new SimpleDomainRegistry();
     private final Supervisor supervisor = new SimpleSupervisor();
     private ProfileCache profileCache;
     private ProfileService profileService;
@@ -116,6 +119,16 @@ public final class WorldGuard {
         return this.flagRegistry;
     }
 
+
+    /**
+     * Get the domain registry.
+     *
+     * @return the domain registry
+     */
+    public DomainRegistry getDomainRegistry() {
+        return this.domainRegistry;
+    }
+
     /**
      * Get the supervisor.
      *

worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/logger/DatabaseHandler.java

@@ -95,9 +95,9 @@ public class DatabaseHandler implements LoggerHandler {
             stmt.setString(1, eventType.name());
             stmt.setString(2, worldName);
             stmt.setString(3, player != null ? player.getName() : "");
-            stmt.setInt(4, pos.getBlockX());
-            stmt.setInt(5, pos.getBlockY());
-            stmt.setInt(6, pos.getBlockZ());
+            stmt.setInt(4, pos.x());
+            stmt.setInt(5, pos.y());
+            stmt.setInt(6, pos.z());
             stmt.setString(7, item);
             stmt.setInt(8, (int)(System.currentTimeMillis() / 1000));
             stmt.setString(9, comment);

worldguard-core/src/main/java/com/sk89q/worldguard/blacklist/logger/FileHandler.java

@@ -221,7 +221,7 @@ public class FileHandler implements LoggerHandler {
      * @return The position's coordinates in human-readable form
      */
     private String getCoordinates(BlockVector3 pos) {
-        return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
+        return "@" + pos.x() + "," + pos.y() + "," + pos.z();
     }
 
     private void logEvent(BlacklistEvent event, String text, Target target, BlockVector3 pos, String comment) {

worldguard-core/src/main/java/com/sk89q/worldguard/commands/CommandInputContext.java

@@ -0,0 +1,111 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.commands;
+
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldguard.LocalPlayer;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+
+public abstract class CommandInputContext<T extends Exception> {
+    protected final Actor sender;
+    protected final String input;
+
+    protected Map<String, Object> context;
+
+    protected CommandInputContext(Actor sender, String input, Map<String, Object> values) {
+        this.sender = sender;
+        this.input = input;
+        this.context = values;
+    }
+
+    public void put(String name, Object value) {
+        context.put(name, value);
+    }
+
+    public Actor getSender() {
+        return sender;
+    }
+
+    public String getUserInput() {
+        return input;
+    }
+
+    /**
+     * Gets the CommandSender as a player.
+     *
+     * @return Player
+     * @throws T if the sender is not a player
+     */
+    public LocalPlayer getPlayerSender() throws T {
+        if (sender.isPlayer() && sender instanceof LocalPlayer) {
+            return (LocalPlayer) sender;
+        } else {
+            throw createException("Not a player");
+        }
+    }
+
+    public Integer getUserInputAsInt() throws T {
+        try {
+            return Integer.parseInt(input);
+        } catch (NumberFormatException e) {
+            throw createException("Not a number: " + input);
+        }
+    }
+
+    public Double getUserInputAsDouble() throws T {
+        try {
+            return Double.parseDouble(input);
+        } catch (NumberFormatException e) {
+            throw createException("Not a number: " + input);
+        }
+    }
+
+    protected abstract T createException(String str);
+
+    /**
+     * Get an object from the context by key name.
+     * May return null if the object does not exist in the context.
+     *
+     * @param name key name of the object
+     * @return the object matching the key, or null
+     */
+    @Nullable
+    public Object get(String name) {
+        return get(name, null);
+    }
+
+    /**
+     * Get an object from the context by key name.
+     * Will only return null if
+     *  a) you provide null as the default
+     *  b) the key has explicity been set to null
+     *
+     * @param name key name of the object
+     * @return the object matching the key
+     */
+    @Nullable
+    public Object get(String name, Object defaultValue) {
+        Object obj;
+        return (((obj = context.get(name)) != null) || context.containsKey(name)
+                ? obj : defaultValue);
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/FlagHelperBox.java

@@ -378,7 +378,7 @@ class FlagHelperBox extends PaginationBox {
         if (currVal == null) {
             currVal = getInheritedValue(region, flag);
         }
-        String display = currVal == null ? regName : currVal.getId();
+        String display = currVal == null ? regName : currVal.id();
         appendValueText(builder, flag, display, null);
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java

@@ -25,16 +25,27 @@ import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
 import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
 import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.util.auth.AuthorizationException;
+import com.sk89q.worldedit.util.formatting.component.ErrorFormat;
+import com.sk89q.worldedit.util.formatting.text.Component;
+import com.sk89q.worldedit.util.formatting.text.TextComponent;
+import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
+import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
+import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.domains.registry.DomainFactory;
+import com.sk89q.worldguard.domains.registry.DomainRegistry;
+import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.util.DomainInputResolver;
 import com.sk89q.worldguard.protection.util.DomainInputResolver.UserLocatorPolicy;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 public class MemberCommands extends RegionCommandsBase {
@@ -67,6 +78,8 @@ public class MemberCommands extends RegionCommandsBase {
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
+        resolver.setActor(sender);
+        resolver.setRegion(region);
 
 
         final String description = String.format("Adding members to the region '%s' on '%s'", region.getId(), world.getName());
@@ -101,7 +114,8 @@ public class MemberCommands extends RegionCommandsBase {
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
-
+        resolver.setActor(sender);
+        resolver.setRegion(region);
 
         final String description = String.format("Adding owners to the region '%s' on '%s'", region.getId(), world.getName());
         AsyncCommandBuilder.wrap(checkedAddOwners(sender, manager, region, world, resolver), sender)
@@ -174,6 +188,8 @@ public class MemberCommands extends RegionCommandsBase {
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
+            resolver.setActor(sender);
+            resolver.setRegion(region);
 
             callable = resolver;
         }
@@ -217,6 +233,8 @@ public class MemberCommands extends RegionCommandsBase {
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
+            resolver.setActor(sender);
+            resolver.setRegion(region);
 
             callable = resolver;
         }

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java

@@ -59,7 +59,7 @@ import com.sk89q.worldguard.protection.FlagValueCalculator;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
 import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
 import com.sk89q.worldguard.protection.flags.RegionGroup;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -160,7 +160,7 @@ public final class RegionCommands extends RegionCommandsBase {
             region = checkRegionFromSelection(sender, id);
         }
 
-        RegionAdder task = new RegionAdder(manager, region);
+        RegionAdder task = new RegionAdder(manager, region, sender);
         task.addOwnersFromCommand(args, 2);
 
         final String description = String.format("Adding region '%s'", region.getId());
@@ -214,7 +214,7 @@ public final class RegionCommands extends RegionCommandsBase {
 
         region.copyFrom(existing);
 
-        RegionAdder task = new RegionAdder(manager, region);
+        RegionAdder task = new RegionAdder(manager, region, sender);
 
         final String description = String.format("Updating region '%s'", region.getId());
         AsyncCommandBuilder.wrap(task, sender)
@@ -587,7 +587,7 @@ public final class RegionCommands extends RegionCommandsBase {
             // the [value] part throws an error.
             try {
                 groupValue = groupFlag.parseInput(FlagContext.create().setSender(sender).setInput(group).setObject("region", existing).build());
-            } catch (InvalidFlagFormat e) {
+            } catch (InvalidFlagFormatException e) {
                 throw new CommandException(e.getMessage());
             }
 
@@ -598,7 +598,7 @@ public final class RegionCommands extends RegionCommandsBase {
             // Set the flag if [value] was given even if [-g group] was given as well
             try {
                 value = setFlag(existing, foundFlag, sender, value).toString();
-            } catch (InvalidFlagFormat e) {
+            } catch (InvalidFlagFormatException e) {
                 throw new CommandException(e.getMessage());
             }
 

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java

@@ -32,15 +32,12 @@ import com.sk89q.worldedit.regions.CuboidRegion;
 import com.sk89q.worldedit.regions.Polygonal2DRegion;
 import com.sk89q.worldedit.regions.Region;
 import com.sk89q.worldedit.regions.RegionSelector;
-import com.sk89q.worldedit.regions.selector.CuboidRegionSelector;
-import com.sk89q.worldedit.regions.selector.Polygonal2DRegionSelector;
 import com.sk89q.worldedit.util.formatting.component.ErrorFormat;
 import com.sk89q.worldedit.util.formatting.component.SubtleFormat;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
 import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
-import com.sk89q.worldedit.util.formatting.text.format.TextDecoration;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
@@ -48,7 +45,7 @@ import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
@@ -308,8 +305,8 @@ class RegionCommandsBase {
         // Detect the type of region from WorldEdit
         if (selection instanceof Polygonal2DRegion) {
             Polygonal2DRegion polySel = (Polygonal2DRegion) selection;
-            int minY = polySel.getMinimumPoint().getBlockY();
-            int maxY = polySel.getMaximumPoint().getBlockY();
+            int minY = polySel.getMinimumPoint().y();
+            int maxY = polySel.getMaximumPoint().y();
             return new ProtectedPolygonalRegion(id, polySel.getPoints(), minY, maxY);
         } else if (selection instanceof CuboidRegion) {
             BlockVector3 min = selection.getMinimumPoint();
@@ -348,7 +345,7 @@ class RegionCommandsBase {
         if (region instanceof GlobalProtectedRegion) {
             return;
         }
-        int height = region.getMaximumPoint().getBlockY() - region.getMinimumPoint().getBlockY();
+        int height = region.getMaximumPoint().y() - region.getMinimumPoint().y();
         if (height <= 2) {
             sender.printDebug("(Warning: The height of the region was " + (height + 1) + " block(s).)");
         }
@@ -418,9 +415,9 @@ class RegionCommandsBase {
      * @param flag the flag
      * @param sender the sender
      * @param value the value
-     * @throws InvalidFlagFormat thrown if the value is invalid
+     * @throws InvalidFlagFormatException thrown if the value is invalid
      */
-    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormat {
+    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormatException {
         V val = flag.parseInput(FlagContext.create().setSender(sender).setInput(value).setObject("region", region).build());
         region.setFlag(flag, val);
         return val;

worldguard-core/src/main/java/com/sk89q/worldguard/commands/task/RegionAdder.java

@@ -20,6 +20,7 @@
 package com.sk89q.worldguard.commands.task;
 
 import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -39,6 +40,7 @@ public class RegionAdder implements Callable<ProtectedRegion> {
 
     private final RegionManager manager;
     private final ProtectedRegion region;
+    private final Actor actor;
     @Nullable
     private String[] ownersInput;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
@@ -46,15 +48,26 @@ public class RegionAdder implements Callable<ProtectedRegion> {
     /**
      * Create a new instance.
      *
-     * @param manager the manage
+     * @param manager the manager
      * @param region the region
      */
     public RegionAdder(RegionManager manager, ProtectedRegion region) {
+        this(manager, region, null);
+    }
+
+    /**
+     * Create a new instance.
+     * @param manager the manager
+     * @param region the region
+     * @param actor the actor
+     */
+    public RegionAdder(RegionManager manager, ProtectedRegion region, Actor actor) {
         checkNotNull(manager);
         checkNotNull(region);
 
         this.manager = manager;
         this.region = region;
+        this.actor = actor;
     }
 
     /**
@@ -75,6 +88,9 @@ public class RegionAdder implements Callable<ProtectedRegion> {
         if (ownersInput != null) {
             DomainInputResolver resolver = new DomainInputResolver(WorldGuard.getInstance().getProfileService(), ownersInput);
             resolver.setLocatorPolicy(locatorPolicy);
+            resolver.setActor(actor);
+            resolver.setRegion(region);
+
             DefaultDomain domain = resolver.call();
             region.getOwners().addAll(domain);
         }

worldguard-core/src/main/java/com/sk89q/worldguard/domains/CustomDomain.java

@@ -0,0 +1,108 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.domains.registry.CustomDomainContext;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
+import com.sk89q.worldguard.util.ChangeTracked;
+
+import java.util.regex.Pattern;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public abstract class CustomDomain implements Domain, ChangeTracked {
+    private static final Pattern VALID_NAME = Pattern.compile("^[a-z0-9\\-]{1,40}$");
+
+    private final String name;
+    private boolean dirty;
+
+    public CustomDomain(String name) {
+        if (name == null ||!isValidName(name)) {
+            throw new IllegalArgumentException("Invalid Domain name used.");
+        }
+        this.name = name;
+    }
+
+    /**
+     * Get the name of the domain resolver.
+     *
+     * @return The name of the domain
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Parse a given input to fill the context of the CustomDomain.
+     *
+     * @param context the {@link CustomDomainContext}
+     * @throws InvalidDomainFormatException Raised if the input is invalid
+     */
+    public abstract void parseInput(CustomDomainContext context) throws InvalidDomainFormatException;
+
+    /**
+     * Convert a raw type that was loaded (from a YAML file, for example)
+     * into the custom domain.
+     *
+     * @param o The object
+     */
+    public abstract void unmarshal(Object o);
+
+    /**
+     * Convert the current Domain to a storable foramt
+     *
+     * @return The marshalled type
+     */
+    public abstract Object marshal();
+
+    /**
+     * Test whether a flag name is valid.
+     *
+     * @param name The flag name
+     * @return Whether the name is valid
+     */
+    public static boolean isValidName(String name) {
+        checkNotNull(name, "name");
+        // g is already reserved by the group domain
+        return VALID_NAME.matcher(name).matches() && !name.equalsIgnoreCase("g");
+    }
+
+
+    @Override
+    public boolean contains(LocalPlayer player) {
+        return contains(player.getUniqueId());
+    }
+
+    @Override
+    public int size() {
+        return 1;
+    }
+
+    @Override
+    public boolean isDirty() {
+        return dirty;
+    }
+
+    @Override
+    public void setDirty(boolean dirty) {
+        this.dirty = dirty;
+    }
+}

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

@@ -22,8 +22,6 @@ package com.sk89q.worldguard.domains;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.sk89q.worldguard.util.profile.Profile;
-import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
@@ -31,14 +29,19 @@ import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.util.ChangeTracked;
+import com.sk89q.worldguard.util.profile.Profile;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -50,6 +53,9 @@ public class DefaultDomain implements Domain, ChangeTracked {
     private PlayerDomain playerDomain = new PlayerDomain();
     private GroupDomain groupDomain = new GroupDomain();
 
+    private final Map<String, CustomDomain> customDomains = new ConcurrentHashMap<>();
+    private boolean customDomainsChanged = false;
+
     /**
      * Create a new domain.
      */
@@ -64,6 +70,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
     public DefaultDomain(DefaultDomain existing) {
         setPlayerDomain(existing.getPlayerDomain());
         setGroupDomain(existing.getGroupDomain());
+        setCustomDomains(existing.customDomains);
     }
 
     /**
@@ -104,6 +111,72 @@ public class DefaultDomain implements Domain, ChangeTracked {
         this.groupDomain = new GroupDomain(groupDomain);
     }
 
+    /**
+     * Add new custom domains
+     *
+     * @param customDomain a domain
+     */
+    public void addCustomDomain(CustomDomain customDomain) {
+        checkNotNull(customDomain);
+        this.customDomains.put(customDomain.getName(), customDomain);
+        this.customDomainsChanged = true;
+    }
+
+    /**
+     * Remove a custom domain matched by the name
+     *
+     * @param name the name
+     */
+    public void removeCustomDomain(String name) {
+        checkNotNull(name);
+        if (this.customDomains.remove(name) != null) {
+            this.customDomainsChanged = true;
+        }
+    }
+
+    /**
+     * Remove a custom domain
+     *
+     * @param customDomain a domain
+     */
+    public void removeCustomDomain(CustomDomain customDomain) {
+        checkNotNull(customDomain);
+        if (this.customDomains.remove(customDomain.getName()) != null) {
+            this.customDomainsChanged = true;
+        }
+    }
+
+    /**
+     * Set the api domains to a specified value
+     *
+     * @param customDomains the domains
+     */
+    public void setCustomDomains(Map<String, CustomDomain> customDomains) {
+        checkNotNull(customDomains);
+        this.customDomains.clear();
+        this.customDomains.putAll(customDomains);
+        this.customDomainsChanged = true;
+    }
+
+    /**
+     * Get all api domains
+     *
+     * @return a unmodifiable copy of the domains
+     */
+    public Collection<CustomDomain> getCustomDomains() {
+        return Collections.unmodifiableCollection(this.customDomains.values());
+    }
+
+    /**
+     * Get the api domain specified by its name
+     *
+     * @param name the name of the domain
+     * @return the custom domain
+     */
+    public @Nullable CustomDomain getCustomDomain(String name) {
+        return this.customDomains.get(name);
+    }
+
     /**
      * Add the given player to the domain, identified by the player's name.
      *
@@ -175,6 +248,9 @@ public class DefaultDomain implements Domain, ChangeTracked {
         for (String group : other.getGroups()) {
             addGroup(group);
         }
+        for (CustomDomain domain : other.getCustomDomains()) {
+            addCustomDomain(domain);
+        }
     }
 
     /**
@@ -193,6 +269,9 @@ public class DefaultDomain implements Domain, ChangeTracked {
         for (String group : other.getGroups()) {
             removeGroup(group);
         }
+        for (CustomDomain domain : other.getCustomDomains()) {
+            removeCustomDomain(domain.getName());
+        }
     }
 
     /**
@@ -242,12 +321,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     @Override
     public boolean contains(LocalPlayer player) {
-        return playerDomain.contains(player) || groupDomain.contains(player);
+        return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.values().stream().anyMatch(d -> d.contains(player));
     }
 
     @Override
     public boolean contains(UUID uniqueId) {
-        return playerDomain.contains(uniqueId);
+        return playerDomain.contains(uniqueId) || customDomains.values().stream().anyMatch(d -> d.contains(uniqueId));
     }
 
     @Override
@@ -257,7 +336,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     @Override
     public int size() {
-        return groupDomain.size() + playerDomain.size();
+        return groupDomain.size() + playerDomain.size() + customDomains.size();
     }
 
     @Override
@@ -275,7 +354,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
     }
 
     public String toPlayersString(@Nullable ProfileCache cache) {
-        StringBuilder str = new StringBuilder();
         List<String> output = new ArrayList<>();
 
         for (String name : playerDomain.getPlayers()) {
@@ -299,13 +377,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
         }
 
         output.sort(String.CASE_INSENSITIVE_ORDER);
-        for (Iterator<String> it = output.iterator(); it.hasNext();) {
-            str.append(it.next());
-            if (it.hasNext()) {
-                str.append(", ");
-            }
-        }
-        return str.toString();
+        return String.join(", ", output);
     }
     
     public String toGroupsString() {
@@ -320,25 +392,20 @@ public class DefaultDomain implements Domain, ChangeTracked {
         return str.toString();
     }
 
-    public String toUserFriendlyString() {
-        StringBuilder str = new StringBuilder();
-
-        if (playerDomain.size() > 0) {
-            str.append(toPlayersString());
+    public String toCustomDomainsString() {
+        List<String> output = new ArrayList<>();
+        for (CustomDomain customDomain : customDomains.values()) {
+            output.add(customDomain.getName() + ":" + customDomain.toString());
         }
-
-        if (groupDomain.size() > 0) {
-            if (str.length() > 0) {
-                str.append("; ");
-            }
-
-            str.append(toGroupsString());
-        }
-
-        return str.toString();
+        output.sort(String.CASE_INSENSITIVE_ORDER);
+        return String.join(", ", output);
     }
 
-    public String toUserFriendlyString(ProfileCache cache) {
+    public String toUserFriendlyString() {
+        return toUserFriendlyString(null);
+    }
+
+    public String toUserFriendlyString(@Nullable ProfileCache cache) {
         StringBuilder str = new StringBuilder();
 
         if (playerDomain.size() > 0) {
@@ -352,6 +419,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
             str.append(toGroupsString());
         }
+        if (!customDomains.isEmpty()) {
+            if (str.length() > 0) {
+                str.append("; ");
+            }
+            str.append(toCustomDomainsString());
+        }
 
         return str.toString();
     }
@@ -367,6 +440,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
             }
             builder.append(toGroupsComponent());
         }
+        if (!customDomains.isEmpty()) {
+            if (playerDomain.size() > 0 || groupDomain.size() > 0) {
+                builder.append(TextComponent.of("; "));
+            }
+            builder.append(toCustomDomainsComponent());
+        }
         return builder.build();
     }
 
@@ -442,21 +521,39 @@ public class DefaultDomain implements Domain, ChangeTracked {
         return builder.build();
     }
 
+    private Component toCustomDomainsComponent() {
+        final TextComponent.Builder builder = TextComponent.builder("");
+        for (Iterator<CustomDomain> it = customDomains.values().iterator(); it.hasNext(); ) {
+            CustomDomain domain = it.next();
+            builder.append(TextComponent.of(domain.getName() + ":", TextColor.LIGHT_PURPLE))
+                    .append(TextComponent.of(domain.toString(), TextColor.GOLD));
+            if (it.hasNext()) {
+                builder.append(TextComponent.of(", "));
+            }
+        }
+        return builder.build().hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("CustomDomain")));
+    }
+
+
     @Override
     public boolean isDirty() {
-        return playerDomain.isDirty() || groupDomain.isDirty();
+        return playerDomain.isDirty() || groupDomain.isDirty() ||
+                customDomainsChanged ||  customDomains.values().stream().anyMatch(ChangeTracked::isDirty);
     }
 
     @Override
     public void setDirty(boolean dirty) {
         playerDomain.setDirty(dirty);
         groupDomain.setDirty(dirty);
+        customDomainsChanged = dirty;
+        customDomains.values().forEach(d -> d.setDirty(dirty));
     }
 
     @Override
     public String toString() {
         return "{players=" + playerDomain +
                 ", groups=" + groupDomain +
+                ", custom=" + customDomains +
                 '}';
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/CustomDomainContext.java

@@ -0,0 +1,98 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+import com.google.common.collect.Maps;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldguard.commands.CommandInputContext;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+
+public final class CustomDomainContext extends CommandInputContext<InvalidDomainFormatException> {
+
+    private CustomDomainContext(Actor sender, String input, Map<String, Object> values) {
+        super(sender, input, values);
+    }
+
+
+    public static CustomDomainContext.CustomDomainContextBuilder create() {
+        return new CustomDomainContext.CustomDomainContextBuilder();
+    }
+
+    /**
+     * Create a copy of this CustomDomainContext, with optional substitutions for values
+     *
+     * <p>If any supplied variable is null, it will be ignored.
+     * If a map is supplied, it will override this CustomDomainContext's values of the same key,
+     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
+     *
+     * @param commandSender CommandSender for the new CustomDomainContext to run under
+     * @param s String of the user input for the new CustomDomainContext
+     * @param values map of values to override from the current CustomDomainContext
+     * @return a copy of this CustomDomainContext
+     */
+    public CustomDomainContext copyWith(@Nullable Actor commandSender, @Nullable String s, @Nullable Map<String, Object> values) {
+        Map<String, Object> map = Maps.newHashMap();
+        map.putAll(context);
+        if (values != null) {
+            map.putAll(values);
+        }
+        return new CustomDomainContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
+    }
+
+    @Override
+    protected InvalidDomainFormatException createException(String str) {
+        return new InvalidDomainFormatException(str);
+    }
+
+    public static class CustomDomainContextBuilder {
+        private Actor sender;
+        private String input;
+        private Map<String, Object> map = Maps.newHashMap();
+
+        public CustomDomainContextBuilder setSender(Actor sender) {
+            this.sender = sender;
+            return this;
+        }
+
+        public CustomDomainContextBuilder setInput(String input) {
+            this.input = input;
+            return this;
+        }
+
+        public CustomDomainContextBuilder setObject(String key, Object value) {
+            this.map.put(key, value);
+            return this;
+        }
+
+        public boolean tryAddToMap(String key, Object value) {
+            if (map.containsKey(key)) return false;
+            this.map.put(key, value);
+            return true;
+        }
+
+        public CustomDomainContext build() {
+            return new CustomDomainContext(sender, input, map);
+        }
+    }
+
+}
+

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/DomainConflictException.java

@@ -0,0 +1,26 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+public class DomainConflictException extends RuntimeException {
+    public DomainConflictException(String message) {
+        super(message);
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/DomainFactory.java

@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ */
+
+
+package com.sk89q.worldguard.domains.registry;
+
+import com.sk89q.worldguard.domains.CustomDomain;
+
+@FunctionalInterface
+public interface DomainFactory<T extends CustomDomain> {
+    T create(String name);
+}

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/DomainRegistry.java

@@ -0,0 +1,94 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+import com.sk89q.worldguard.domains.CustomDomain;
+
+import javax.annotation.Nullable;
+import java.util.List;
+import java.util.Map;
+
+public interface DomainRegistry extends Iterable<DomainFactory<?>> {
+
+    /**
+     * Register a new Domain
+     *
+     * <p>There may be an appropiate time to register domains. if domains are
+     * registered outside this time, then an exception may be thrown.</p>
+     *
+     * @param domain The domain
+     * @throws DomainConflictException Thrown when already an existing domain exists with the same name
+     * @throws IllegalStateException If it is not the right time to register new domains
+     */
+    void register(String name, DomainFactory<?> domain) throws DomainConflictException;
+
+    /**
+     * Register a collection of domains.
+     *
+     * <p>There may be an appropriate time to register domains. If domains are
+     * registered outside this time, then an exception may be thrown.</p>
+     *
+     * <p>If there is a domain conflict, then an error will be logged but
+     * no exception will be thrown.</p>
+     *
+     * @param domains a collection of domain factories
+     * @throws IllegalStateException If it is not the right time to register new domains
+     */
+    void registerAll(Map<String, DomainFactory<?>> domains);
+
+    /**
+     * Get the domain by its name.
+     *
+     * @param name The name
+     * @return The domain, if it has been registered
+     */
+    @Nullable
+    DomainFactory<?> get(String name);
+
+    /**
+     * Try to get a domain by its name
+     */
+    @Nullable
+    CustomDomain createDomain(String name);
+
+    /**
+     * Get all domains keyed by the registered name
+     *
+     * @return All domains
+     */
+    Map<String, DomainFactory<?>> getAll();
+
+    /**
+     * Unmarshal a raw map of values into a list of domains with their
+     * unmarshalled values.
+     *
+     * @param rawValues The raw values map
+     * @param createUnknown Whether "just in time" domains should be created for unknown domains
+     * @return The unmarshalled domain list
+     */
+    Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown);
+
+    /**
+     * Get the number of registered domains.
+     *
+     * @return The number of registered domains
+     */
+    int size();
+}

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/InvalidDomainFormatException.java

@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+public class InvalidDomainFormatException extends Exception {
+    private static final long serialVersionUID = 8101615074524004172L;
+
+    public InvalidDomainFormatException(String msg) {
+        super(msg);
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/SimpleDomainRegistry.java

@@ -0,0 +1,166 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Iterators;
+import com.google.common.collect.Maps;
+import com.sk89q.worldguard.domains.CustomDomain;
+
+import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+public class SimpleDomainRegistry implements DomainRegistry {
+    private static final Logger log = Logger.getLogger(SimpleDomainRegistry.class.getCanonicalName());
+
+    private final Object lock = new Object();
+    private final ConcurrentMap<String, DomainFactory<?>> domains = Maps.newConcurrentMap();
+    private boolean initialized = false;
+
+    public boolean isInitialized() {
+        return initialized;
+    }
+
+    public void setInitialized(boolean initialized) {
+        this.initialized = initialized;
+    }
+
+    @Override
+    public void register(String name, DomainFactory<?> domain) throws DomainConflictException {
+        synchronized (lock) {
+            if (initialized) {
+                throw new IllegalStateException("New domains cannot be registered at this time");
+            }
+
+            forceRegister(name, domain);
+        }
+    }
+
+    @Override
+    public void registerAll(Map<String, DomainFactory<?>> domains) {
+        synchronized (lock) {
+            for (Map.Entry<String, DomainFactory<?>> entry : domains.entrySet()) {
+                try {
+                    register(entry.getKey(), entry.getValue());
+                } catch (DomainConflictException e) {
+                    log.log(Level.WARNING, e.getMessage());
+                }
+            }
+        }
+    }
+
+    private <T extends DomainFactory<?>> T forceRegister(String name, T domain) throws DomainConflictException {
+        checkNotNull(domain, "domain");
+        checkNotNull(name, "name");
+
+        if (!CustomDomain.isValidName(name)) {
+            throw new IllegalArgumentException("Invalid Domain name used.");
+        }
+
+        synchronized (lock) {
+            if (domains.containsKey(name)) {
+                throw new DomainConflictException("A domain already exists by the name " + name);
+            }
+
+            domains.put(name, domain);
+        }
+
+        return domain;
+    }
+
+    @Nullable
+    @Override
+    public DomainFactory<?> get(String name) {
+        checkNotNull(name, "name");
+        return domains.get(name.toLowerCase());
+    }
+
+    @Nullable
+    @Override
+    public CustomDomain createDomain(String name) {
+        DomainFactory<?> factory = get(name);
+        if (factory == null) return null;
+        return factory.create(name);
+    }
+
+    @Override
+    public Map<String, DomainFactory<?>> getAll() {
+        return ImmutableMap.copyOf(domains);
+    }
+
+    private CustomDomain getOrCreate(String name, Object value, boolean createUnknown) {
+        CustomDomain customDomain = createDomain(name);
+
+        if (customDomain != null) {
+            customDomain.unmarshal(value);
+            return customDomain;
+        }
+
+        synchronized (lock) {
+            customDomain = createDomain(name); // Load again because the previous load was not synchronized
+            if (customDomain != null) {
+                customDomain.unmarshal(value);
+                return customDomain;
+            }
+            if (createUnknown) {
+                DomainFactory<UnknownDomain> unknownFactory = forceRegister(name, UnknownDomain.FACTORY);
+                if (unknownFactory != null) {
+                    customDomain = unknownFactory.create(name);
+                    if (customDomain != null) customDomain.unmarshal(value);
+                    return customDomain;
+                }
+            }
+        }
+        return null;
+    }
+
+    public Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) {
+        checkNotNull(rawValues, "rawValues");
+
+        Map<String, CustomDomain> domains = new HashMap<>();
+
+        for (Map.Entry<String, Object> entry : rawValues.entrySet()) {
+            try {
+                CustomDomain domain = getOrCreate(entry.getKey(), entry.getValue(), createUnknown);
+                domains.put(domain.getName(), domain);
+            } catch (Throwable e) {
+                log.log(Level.WARNING, "Failed to unmarshal domain for " + entry.getKey(), e);
+            }
+        }
+        return domains;
+    }
+
+    @Override
+    public int size() {
+        return domains.size();
+    }
+
+    @Override
+    public Iterator<DomainFactory<?>> iterator() {
+        return Iterators.unmodifiableIterator(domains.values().iterator());
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/UnknownDomain.java

@@ -0,0 +1,88 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains.registry;
+
+import com.sk89q.worldguard.domains.CustomDomain;
+
+import java.util.UUID;
+
+public class UnknownDomain extends CustomDomain {
+    public static DomainFactory<UnknownDomain> FACTORY = UnknownDomain::new;
+
+    private boolean isDirty = false;
+    private Object o;
+
+    public UnknownDomain(String name) {
+        super(name);
+    }
+
+    @Override
+    public void parseInput(CustomDomainContext context) throws InvalidDomainFormatException {
+        throw new InvalidDomainFormatException("The plugin that registered this domain is not currently installed");
+    }
+
+    @Override
+    public void unmarshal(Object o) {
+        this.o = o;
+    }
+
+    @Override
+    public Object marshal() {
+        return o;
+    }
+
+    @Override
+    public boolean contains(UUID uniqueId) {
+        return false;
+    }
+
+    @Override
+    public boolean contains(String playerName) {
+        return false;
+    }
+
+    @Override
+    public int size() {
+        return 0;
+    }
+
+    @Override
+    public void clear() {
+        isDirty = true;
+        o = null;
+    }
+
+    @Override
+    public void setDirty(boolean dirty) {
+        isDirty = dirty;
+    }
+
+    @Override
+    public boolean isDirty() {
+        return isDirty;
+    }
+
+    @Override
+    public String toString() {
+        return "UnknownDomain{" +
+                "o=" + o +
+                '}';
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/internal/permission/RegionPermissionModel.java

@@ -176,13 +176,14 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     public boolean mayRemoveOwners(ProtectedRegion region) {
         return hasPatternPermission("removeowner", region);
     }
-    
+
     /**
      * Checks to see if the given sender has permission to modify the given region
      * using the region permission pattern.
      * 
      * @param perm the name of the node
      * @param region the region
+     * @return whether the actor has the permission
      */
     private boolean hasPatternPermission(String perm, ProtectedRegion region) {
         if (!(getSender() instanceof Player)) {

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java

@@ -33,7 +33,7 @@ public class BooleanFlag extends Flag<Boolean> {
     }
 
     @Override
-    public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Boolean parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         
         if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes")
@@ -45,7 +45,7 @@ public class BooleanFlag extends Flag<Boolean> {
                 || input.equalsIgnoreCase("0")) {
             return false;
         } else {
-            throw new InvalidFlagFormat("Not a yes/no value: " + input);
+            throw new InvalidFlagFormatException("Not a yes/no value: " + input);
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java

@@ -33,7 +33,7 @@ public class CommandStringFlag extends Flag<String> {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormat {
+    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         if (!input.startsWith("/")) {

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java

@@ -33,7 +33,7 @@ public class DoubleFlag extends NumberFlag<Double> {
     }
 
     @Override
-    public Double parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Double parseInput(FlagContext context) throws InvalidFlagFormatException {
         return context.getUserInputAsDouble();
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java

@@ -40,12 +40,12 @@ public class EntityTypeFlag extends Flag<EntityType> {
     }
 
     @Override
-    public EntityType parseInput(FlagContext context) throws InvalidFlagFormat {
+    public EntityType parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         EntityType entityType = unmarshal(input);
         if (entityType == null) {
-            throw new InvalidFlagFormat("Unknown entity type: " + input);
+            throw new InvalidFlagFormatException("Unknown entity type: " + input);
         }
         return entityType;
     }
@@ -57,6 +57,6 @@ public class EntityTypeFlag extends Flag<EntityType> {
 
     @Override
     public Object marshal(EntityType o) {
-        return o.getId();
+        return o.id();
     }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java

@@ -74,12 +74,12 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormat {
+    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         try {
             return findValue(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormat("Unknown value '" + input + "' in "
+            throw new InvalidFlagFormatException("Unknown value '" + input + "' in "
                     + enumClass.getName());
         }
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java

@@ -181,9 +181,9 @@ public abstract class Flag<T> {
      *
      * @param context the {@link FlagContext}
      * @return The coerced type
-     * @throws InvalidFlagFormat Raised if the input is invalid
+     * @throws InvalidFlagFormatException Raised if the input is invalid
      */
-    public abstract T parseInput(FlagContext context) throws InvalidFlagFormat;
+    public abstract T parseInput(FlagContext context) throws InvalidFlagFormatException;
 
     /**
      * Convert a raw type that was loaded (from a YAML file, for example)

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagContext.java

@@ -21,106 +21,28 @@ package com.sk89q.worldguard.protection.flags;
 
 import com.google.common.collect.Maps;
 import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-
-import java.util.Map;
+import com.sk89q.worldguard.commands.CommandInputContext;
 
 import javax.annotation.Nullable;
+import java.util.Map;
 
-public final class FlagContext {
-
-    private final Actor sender;
-    private final String input;
-
-    private Map<String, Object> context;
+public final class FlagContext extends CommandInputContext<InvalidFlagFormatException> {
 
     private FlagContext(Actor sender, String input, Map<String, Object> values) {
-        this.sender = sender;
-        this.input = input;
-        this.context = values;
+        super(sender, input, values);
     }
 
-    public static FlagContextBuilder create() {
+    public static FlagContext.FlagContextBuilder create() {
         return new FlagContextBuilder();
     }
 
-    public void put(String name, Object value) {
-        context.put(name, value);
-    }
-
-    public Actor getSender() {
-        return sender;
-    }
-
-    public String getUserInput() {
-        return input;
-    }
-
-    /**
-     * Gets the CommandSender as a player.
-     *
-     * @return Player
-     * @throws InvalidFlagFormat if the sender is not a player
-     */
-    public LocalPlayer getPlayerSender() throws InvalidFlagFormat {
-        if (sender.isPlayer() && sender instanceof LocalPlayer) {
-            return (LocalPlayer) sender;
-        } else {
-            throw new InvalidFlagFormat("Not a player");
-        }
-    }
-
-    public Integer getUserInputAsInt() throws InvalidFlagFormat {
-        try {
-            return Integer.parseInt(input);
-        } catch (NumberFormatException e) {
-            throw new InvalidFlagFormat("Not a number: " + input);
-        }
-    }
-
-    public Double getUserInputAsDouble() throws InvalidFlagFormat {
-        try {
-            return Double.parseDouble(input);
-        } catch (NumberFormatException e) {
-            throw new InvalidFlagFormat("Not a number: " + input);
-        }
-    }
-
-    /**
-     * Get an object from the context by key name.
-     * May return null if the object does not exist in the context.
-     *
-     * @param name key name of the object
-     * @return the object matching the key, or null
-     */
-    @Nullable
-    public Object get(String name) {
-        return get(name, null);
-    }
-
-    /**
-     * Get an object from the context by key name.
-     * Will only return null if
-     *  a) you provide null as the default
-     *  b) the key has explicity been set to null
-     *
-     * @param name key name of the object
-     * @return the object matching the key
-     */
-    @Nullable
-    public Object get(String name, Object defaultValue) {
-        Object obj;
-        return (((obj = context.get(name)) != null) || context.containsKey(name)
-            ? obj : defaultValue);
-    }
-
     /**
      * Create a copy of this FlagContext, with optional substitutions for values
      *
-     * If any supplied variable is null, it will be ignored.
+     * <p>If any supplied variable is null, it will be ignored.
      * If a map is supplied, it will override this FlagContext's values of the same key,
-     * but unprovided keys will not be overriden and will be returned as shallow copies.
+     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
      *
      * @param commandSender CommandSender for the new FlagContext to run under
      * @param s String of the user input for the new FlagContext
@@ -136,6 +58,11 @@ public final class FlagContext {
         return new FlagContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
     }
 
+    @Override
+    protected InvalidFlagFormatException createException(String str) {
+        return new InvalidFlagFormatException(str);
+    }
+
     public static class FlagContextBuilder {
         private Actor sender;
         private String input;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/GameModeTypeFlag.java

@@ -40,12 +40,12 @@ public class GameModeTypeFlag extends Flag<GameMode> {
     }
 
     @Override
-    public GameMode parseInput(FlagContext context) throws InvalidFlagFormat {
+    public GameMode parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         GameMode gamemode = unmarshal(input);
         if (gamemode == null) {
-            throw new InvalidFlagFormat("Unknown game mode: " + input);
+            throw new InvalidFlagFormatException("Unknown game mode: " + input);
         }
         return gamemode;
     }
@@ -57,6 +57,6 @@ public class GameModeTypeFlag extends Flag<GameMode> {
 
     @Override
     public Object marshal(GameMode o) {
-        return o.getId();
+        return o.id();
     }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java

@@ -33,7 +33,7 @@ public class IntegerFlag extends NumberFlag<Integer> {
     }
 
     @Override
-    public Integer parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Integer parseInput(FlagContext context) throws InvalidFlagFormatException {
         return context.getUserInputAsInt();
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java

@@ -19,6 +19,10 @@
 
 package com.sk89q.worldguard.protection.flags;
 
+/**
+ * @deprecated replaced by {@link InvalidFlagFormatException}. Will be removed in WorldGuard 8
+ */
+@Deprecated(forRemoval = true)
 public class InvalidFlagFormat extends Exception {
     
     private static final long serialVersionUID = 8101615074524004172L;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormatException.java

@@ -0,0 +1,28 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.protection.flags;
+
+public class InvalidFlagFormatException extends InvalidFlagFormat {
+    private static final long serialVersionUID = 8101615074524004172L;
+
+    public InvalidFlagFormatException(String msg) {
+        super(msg);
+    }
+}

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java

@@ -41,7 +41,7 @@ public class LocationFlag extends Flag<Location> {
     }
 
     @Override
-    public Location parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Location parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         Player player = context.getPlayerSender();
 
@@ -76,7 +76,7 @@ public class LocationFlag extends Flag<Location> {
                             player.printDebug("WARNING: Flag location is outside of region.");
                         } else {
                             // no permission
-                            throw new InvalidFlagFormat("You can't set that flag outside of the region boundaries.");
+                            throw new InvalidFlagFormatException("You can't set that flag outside of the region boundaries.");
                         }
                     }
                     // clamp height to world limits
@@ -86,7 +86,7 @@ public class LocationFlag extends Flag<Location> {
             }
             return loc;
         }
-        throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
+        throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
     }
 
     @Override
@@ -137,9 +137,9 @@ public class LocationFlag extends Flag<Location> {
                 return null;
             }
         }
-        vec.put("x", position.getX());
-        vec.put("y", position.getY());
-        vec.put("z", position.getZ());
+        vec.put("x", position.x());
+        vec.put("y", position.y());
+        vec.put("z", position.z());
         vec.put("yaw", o.getYaw());
         vec.put("pitch", o.getPitch());
         return vec;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/MapFlag.java

@@ -70,7 +70,7 @@ public class MapFlag<K, V> extends Flag<Map<K, V>> {
     }
 
     @Override
-    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormat {
+    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormatException {
 
         final String input = context.getUserInput();
         if (input.isEmpty()) {
@@ -83,7 +83,7 @@ public class MapFlag<K, V> extends Flag<Map<K, V>> {
             final char split = str.indexOf('=') == -1 ? ':' : '=';
             final String[] keyVal = str.split(String.valueOf(split));
             if (keyVal.length != 2) {
-                throw new InvalidFlagFormat("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
+                throw new InvalidFlagFormatException("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
             }
 
             final FlagContext key = context.copyWith(null, keyVal[0], null);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/RegistryFlag.java

@@ -44,10 +44,10 @@ public class RegistryFlag<T extends Keyed> extends Flag<T> {
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormat {
+    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
         final String key = context.getUserInput().trim().toLowerCase(Locale.ROOT);
         return Optional.ofNullable(registry.get(key))
-                .orElseThrow(() -> new InvalidFlagFormat("Unknown " + registry.getName() + ": " + key));
+                .orElseThrow(() -> new InvalidFlagFormatException("Unknown " + registry.getName() + ": " + key));
     }
 
     public Registry<T> getRegistry() {
@@ -61,6 +61,6 @@ public class RegistryFlag<T extends Keyed> extends Flag<T> {
 
     @Override
     public Object marshal(T o) {
-        return o.getId();
+        return o.id();
     }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java

@@ -58,7 +58,7 @@ public class SetFlag<T> extends Flag<Set<T>> {
     }
 
     @Override
-    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if (input.isEmpty()) {
             return Sets.newHashSet();

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java

@@ -78,7 +78,7 @@ public class StateFlag extends Flag<StateFlag.State> {
     }
 
     @Override
-    public State parseInput(FlagContext context) throws InvalidFlagFormat {
+    public State parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
 
         if (input.equalsIgnoreCase("allow")) {
@@ -88,7 +88,7 @@ public class StateFlag extends Flag<StateFlag.State> {
         } else if (input.equalsIgnoreCase("none")) {
             return null;
         } else {
-            throw new InvalidFlagFormat("Expected none/allow/deny but got '" + input + "'");
+            throw new InvalidFlagFormatException("Expected none/allow/deny but got '" + input + "'");
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java

@@ -57,7 +57,7 @@ public class StringFlag extends Flag<String> {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormat {
+    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
         String lines = context.getUserInput().replaceAll("(?<!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\\\n");
         // Add color codes
         lines = CommandUtils.replaceColorMacros(lines);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/TimestampFlag.java

@@ -48,7 +48,7 @@ public class TimestampFlag extends Flag<Instant> {
     }
 
     @Override
-    public Instant parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Instant parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if ("now".equalsIgnoreCase(input)) {
             return Instant.now();
@@ -61,10 +61,10 @@ public class TimestampFlag extends Flag<Instant> {
                 } else if (parsed instanceof ZonedDateTime) {
                     return ((ZonedDateTime) parsed).toInstant();
                 } else {
-                    throw new InvalidFlagFormat("Unrecognized input.");
+                    throw new InvalidFlagFormatException("Unrecognized input.");
                 }
             } catch (DateTimeParseException ignored) {
-                throw new InvalidFlagFormat("Expected 'now' or ISO 8601 formatted input.");
+                throw new InvalidFlagFormatException("Expected 'now' or ISO 8601 formatted input.");
             }
         }
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/UUIDFlag.java

@@ -33,7 +33,7 @@ public class UUIDFlag extends Flag<UUID> {
     }
 
     @Override
-    public UUID parseInput(FlagContext context) throws InvalidFlagFormat {
+    public UUID parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         if ("self".equalsIgnoreCase(input)) {
             return context.getSender().getUniqueId();
@@ -41,7 +41,7 @@ public class UUIDFlag extends Flag<UUID> {
         try {
             return UUID.fromString(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormat("Not a valid uuid: " + input);
+            throw new InvalidFlagFormatException("Not a valid uuid: " + input);
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java

@@ -38,7 +38,7 @@ public class VectorFlag extends Flag<Vector3> {
     }
 
     @Override
-    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormat {
+    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
 
         if ("here".equalsIgnoreCase(input)) {
@@ -56,7 +56,7 @@ public class VectorFlag extends Flag<Vector3> {
                 }
             }
 
-            throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
+            throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
         }
     }
 
@@ -82,9 +82,9 @@ public class VectorFlag extends Flag<Vector3> {
     @Override
     public Object marshal(Vector3 o) {
         Map<String, Object> vec = new HashMap<>();
-        vec.put("x", o.getX());
-        vec.put("y", o.getY());
-        vec.put("z", o.getZ());
+        vec.put("x", o.x());
+        vec.put("y", o.y());
+        vec.put("z", o.z());
         return vec;
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/WeatherTypeFlag.java

@@ -40,12 +40,12 @@ public class WeatherTypeFlag extends Flag<WeatherType> {
     }
 
     @Override
-    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormat {
+    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormatException {
         String input = context.getUserInput();
         input = input.trim();
         WeatherType weatherType = unmarshal(input);
         if (weatherType == null) {
-            throw new InvalidFlagFormat("Unknown weather type: " + input);
+            throw new InvalidFlagFormatException("Unknown weather type: " + input);
         }
         return weatherType;
     }
@@ -57,6 +57,6 @@ public class WeatherTypeFlag extends Flag<WeatherType> {
 
     @Override
     public Object marshal(WeatherType o) {
-        return o.getId();
+        return o.id();
     }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/UnknownFlag.java

@@ -21,7 +21,7 @@ package com.sk89q.worldguard.protection.flags.registry;
 
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
 
 import javax.annotation.Nullable;
 
@@ -32,8 +32,8 @@ public class UnknownFlag extends Flag<Object> {
     }
 
     @Override
-    public Object parseInput(FlagContext context) throws InvalidFlagFormat {
-        throw new InvalidFlagFormat("The plugin that registered this flag is not currently installed");
+    public Object parseInput(FlagContext context) throws InvalidFlagFormatException {
+        throw new InvalidFlagFormatException("The plugin that registered this flag is not currently installed");
     }
 
     @Override

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java

@@ -93,10 +93,10 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
     private ChunkState get(BlockVector2 position, boolean create) {
         ChunkState state;
         synchronized (lock) {
-            state = states.get(position.getBlockX(), position.getBlockZ());
+            state = states.get(position.x(), position.z());
             if (state == null && create) {
                 state = new ChunkState(position);
-                states.put(position.getBlockX(), position.getBlockZ(), state);
+                states.put(position.x(), position.z(), state);
                 executor.submit(new EnumerateRegions(position));
             }
         }
@@ -130,7 +130,7 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
             for (ChunkState state : previousStates.values()) {
                 BlockVector2 position = state.getPosition();
                 positions.add(position);
-                states.put(position.getBlockX(), position.getBlockZ(), new ChunkState(position));
+                states.put(position.x(), position.z(), new ChunkState(position));
             }
 
             if (!positions.isEmpty()) {
@@ -179,9 +179,9 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
     public void forget(BlockVector2 chunkPosition) {
         checkNotNull(chunkPosition);
         synchronized (lock) {
-            states.remove(chunkPosition.getBlockX(), chunkPosition.getBlockZ());
+            states.remove(chunkPosition.x(), chunkPosition.z());
             ChunkState state = lastState;
-            if (state != null && state.getPosition().getBlockX() == chunkPosition.getBlockX() && state.getPosition().getBlockZ() == chunkPosition.getBlockZ()) {
+            if (state != null && state.getPosition().x() == chunkPosition.x() && state.getPosition().z() == chunkPosition.z()) {
                 lastState = null;
             }
         }
@@ -238,10 +238,10 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
         checkNotNull(consumer);
 
         ChunkState state = lastState;
-        int chunkX = position.getBlockX() >> 4;
-        int chunkZ = position.getBlockZ() >> 4;
+        int chunkX = position.x() >> 4;
+        int chunkZ = position.z() >> 4;
 
-        if (state == null || state.getPosition().getBlockX() != chunkX || state.getPosition().getBlockZ() != chunkZ) {
+        if (state == null || state.getPosition().x() != chunkX || state.getPosition().z() != chunkZ) {
             state = get(BlockVector2.at(chunkX, chunkZ), false);
         }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/index/PriorityRTreeIndex.java

@@ -69,7 +69,7 @@ public class PriorityRTreeIndex extends HashMapIndex {
     @Override
     public void applyContaining(BlockVector3 position, Predicate<ProtectedRegion> consumer) {
         Set<ProtectedRegion> seen = new HashSet<>();
-        MBR pointMBR = new SimpleMBR(position.getX(), position.getX(), position.getY(), position.getY(), position.getZ(), position.getZ());
+        MBR pointMBR = new SimpleMBR(position.x(), position.x(), position.y(), position.y(), position.z(), position.z());
 
         for (ProtectedRegion region : tree.find(pointMBR)) {
             if (region.contains(position) && !seen.contains(region)) {
@@ -87,7 +87,7 @@ public class PriorityRTreeIndex extends HashMapIndex {
         BlockVector3 max = region.getMaximumPoint().ceil();
 
         Set<ProtectedRegion> candidates = new HashSet<>();
-        MBR pointMBR = new SimpleMBR(min.getX(), max.getX(), min.getY(), max.getY(), min.getZ(), max.getZ());
+        MBR pointMBR = new SimpleMBR(min.x(), max.x(), min.y(), max.y(), min.z(), max.z());
 
         for (ProtectedRegion found : tree.find(pointMBR)) {
             candidates.add(found);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/migration/WorldHeightMigration.java

@@ -84,8 +84,8 @@ public class WorldHeightMigration extends AbstractMigration {
             if (min == 0 && max == 255) return;
         }
         for (ProtectedRegion region : regions) {
-            if (region.getMinimumPoint().getBlockY() <= 0
-                    && region.getMaximumPoint().getBlockY() >= 255) {
+            if (region.getMinimumPoint().y() <= 0
+                    && region.getMaximumPoint().y() >= 255) {
                 expand(region, min, max);
                 changed++;
             }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java

@@ -27,6 +27,8 @@ import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.CustomDomain;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.FlagUtil;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -214,14 +216,14 @@ public class YamlRegionFile implements RegionDatabase {
             } else if (region instanceof ProtectedPolygonalRegion) {
                 ProtectedPolygonalRegion poly = (ProtectedPolygonalRegion) region;
                 node.setProperty("type", "poly2d");
-                node.setProperty("min-y", poly.getMinimumPoint().getBlockY());
-                node.setProperty("max-y", poly.getMaximumPoint().getBlockY());
+                node.setProperty("min-y", poly.getMinimumPoint().y());
+                node.setProperty("max-y", poly.getMaximumPoint().y());
 
                 List<Map<String, Object>> points = new ArrayList<>();
                 for (BlockVector2 point : poly.getPoints()) {
                     Map<String, Object> data = new HashMap<>();
-                    data.put("x", point.getBlockX());
-                    data.put("z", point.getBlockZ());
+                    data.put("x", point.x());
+                    data.put("z", point.z());
                     points.add(data);
                 }
 
@@ -285,6 +287,12 @@ public class YamlRegionFile implements RegionDatabase {
             }
         }
 
+        YAMLNode apiDomains = node.getNode("custom");
+        if (apiDomains != null) {
+            Map<String, CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true);
+            domain.setCustomDomains(parsedDomains);
+        }
+
         return domain;
     }
 
@@ -305,6 +313,14 @@ public class YamlRegionFile implements RegionDatabase {
         setDomainData(domainData, "unique-ids", domain.getUniqueIds());
         setDomainData(domainData, "groups", domain.getGroups());
 
+        if (!domain.getCustomDomains().isEmpty()) {
+            Map<String, Object> values = new HashMap<>();
+            for (CustomDomain customDomain : domain.getCustomDomains()) {
+                values.put(customDomain.getName(), customDomain.marshal());
+            }
+            domainData.put("custom", values);
+        }
+
         return domainData;
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/sql/RegionInserter.java

@@ -113,12 +113,12 @@ class RegionInserter {
                     BlockVector3 max = region.getMaximumPoint();
 
                     stmt.setString(1, region.getId());
-                    stmt.setInt(2, min.getBlockZ());
-                    stmt.setInt(3, min.getBlockY());
-                    stmt.setInt(4, min.getBlockX());
-                    stmt.setInt(5, max.getBlockZ());
-                    stmt.setInt(6, max.getBlockY());
-                    stmt.setInt(7, max.getBlockX());
+                    stmt.setInt(2, min.z());
+                    stmt.setInt(3, min.y());
+                    stmt.setInt(4, min.x());
+                    stmt.setInt(5, max.z());
+                    stmt.setInt(6, max.y());
+                    stmt.setInt(7, max.x());
                     stmt.addBatch();
                 }
 
@@ -141,8 +141,8 @@ class RegionInserter {
             for (List<ProtectedPolygonalRegion> partition : Lists.partition(polygons, StatementBatch.MAX_BATCH_SIZE)) {
                 for (ProtectedPolygonalRegion region : partition) {
                     stmt.setString(1, region.getId());
-                    stmt.setInt(2, region.getMaximumPoint().getBlockY());
-                    stmt.setInt(3, region.getMinimumPoint().getBlockY());
+                    stmt.setInt(2, region.getMaximumPoint().y());
+                    stmt.setInt(3, region.getMinimumPoint().y());
                     stmt.addBatch();
                 }
 
@@ -167,8 +167,8 @@ class RegionInserter {
             for (ProtectedPolygonalRegion region : polygons) {
                 for (BlockVector2 point : region.getPoints()) {
                     stmt.setString(1, region.getId());
-                    stmt.setInt(2, point.getBlockZ());
-                    stmt.setInt(3, point.getBlockX());
+                    stmt.setInt(2, point.z());
+                    stmt.setInt(3, point.x());
                     batch.addBatch();
                 }
             }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/GlobalProtectedRegion.java

@@ -69,7 +69,7 @@ public class GlobalProtectedRegion extends ProtectedRegion {
     public List<BlockVector2> getPoints() {
         // This doesn't make sense
         List<BlockVector2> pts = new ArrayList<>();
-        pts.add(BlockVector2.at(min.getBlockX(), min.getBlockZ()));
+        pts.add(BlockVector2.at(min.x(), min.z()));
         return pts;
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedCuboidRegion.java

@@ -113,10 +113,10 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
     @Override
     public List<BlockVector2> getPoints() {
         List<BlockVector2> pts = new ArrayList<>();
-        int x1 = min.getBlockX();
-        int x2 = max.getBlockX();
-        int z1 = min.getBlockZ();
-        int z2 = max.getBlockZ();
+        int x1 = min.x();
+        int x2 = max.x();
+        int z1 = min.z();
+        int z2 = max.z();
 
         pts.add(BlockVector2.at(x1, z1));
         pts.add(BlockVector2.at(x2, z1));
@@ -128,12 +128,12 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
 
     @Override
     public boolean contains(BlockVector3 pt) {
-        final double x = pt.getX();
-        final double y = pt.getY();
-        final double z = pt.getZ();
-        return x >= min.getBlockX() && x < max.getBlockX() + 1
-                && y >= min.getBlockY() && y < max.getBlockY() + 1
-                && z >= min.getBlockZ() && z < max.getBlockZ() + 1;
+        final double x = pt.x();
+        final double y = pt.y();
+        final double z = pt.z();
+        return x >= min.x() && x < max.x() + 1
+                && y >= min.y() && y < max.y() + 1
+                && z >= min.z() && z < max.z() + 1;
     }
 
     @Override
@@ -143,10 +143,10 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
 
     @Override
     Area toArea() {
-        int x = getMinimumPoint().getBlockX();
-        int z = getMinimumPoint().getBlockZ();
-        int width = getMaximumPoint().getBlockX() - x + 1;
-        int height = getMaximumPoint().getBlockZ() - z + 1;
+        int x = getMinimumPoint().x();
+        int z = getMinimumPoint().z();
+        int width = getMaximumPoint().x() - x + 1;
+        int height = getMaximumPoint().z() - z + 1;
         return new Area(new Rectangle(x, z, width, height));
     }
 
@@ -161,9 +161,9 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
 
     @Override
     public int volume() {
-        int xLength = max.getBlockX() - min.getBlockX() + 1;
-        int yLength = max.getBlockY() - min.getBlockY() + 1;
-        int zLength = max.getBlockZ() - min.getBlockZ() + 1;
+        int xLength = max.x() - min.x() + 1;
+        int yLength = max.y() - min.y() + 1;
+        int zLength = max.z() - min.z() + 1;
 
         try {
             long v = MathUtils.checkedMultiply(xLength, yLength);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedPolygonalRegion.java

@@ -65,8 +65,8 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
         ImmutableList<BlockVector2> immutablePoints = ImmutableList.copyOf(points);
         setMinMaxPoints(immutablePoints, minY, maxY);
         this.points = immutablePoints;
-        this.minY = min.getBlockY();
-        this.maxY = max.getBlockY();
+        this.minY = min.y();
+        this.maxY = max.y();
     }
 
     /**
@@ -82,7 +82,7 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
         List<BlockVector3> points = new ArrayList<>();
         int y = minY;
         for (BlockVector2 point2D : points2D) {
-            points.add(BlockVector3.at(point2D.getBlockX(), y, point2D.getBlockZ()));
+            points.add(BlockVector3.at(point2D.x(), y, point2D.z()));
             y = maxY;
         }
         setMinMaxPoints(points);
@@ -102,15 +102,15 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
     public boolean contains(BlockVector3 position) {
         checkNotNull(position);
 
-        int targetX = position.getBlockX(); // Width
-        int targetY = position.getBlockY(); // Height
-        int targetZ = position.getBlockZ(); // Depth
+        int targetX = position.x(); // Width
+        int targetY = position.y(); // Height
+        int targetZ = position.z(); // Depth
 
         if (targetY < minY || targetY > maxY) {
             return false;
         }
         //Quick and dirty check.
-        if (targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()) {
+        if (targetX < min.x() || targetX > max.x() || targetZ < min.z() || targetZ > max.z()) {
             return false;
         }
         boolean inside = false;
@@ -122,12 +122,12 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
         long crossproduct;
         int i;
 
-        xOld = points.get(npoints - 1).getBlockX();
-        zOld = points.get(npoints - 1).getBlockZ();
+        xOld = points.get(npoints - 1).x();
+        zOld = points.get(npoints - 1).z();
 
         for (i = 0; i < npoints; i++) {
-            xNew = points.get(i).getBlockX();
-            zNew = points.get(i).getBlockZ();
+            xNew = points.get(i).x();
+            zNew = points.get(i).z();
             //Check for corner
             if (xNew == targetX && zNew == targetZ) {
                 return true;
@@ -173,8 +173,8 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
 
         int i = 0;
         for (BlockVector2 point : points) {
-            xCoords[i] = point.getBlockX();
-            yCoords[i] = point.getBlockZ();
+            xCoords[i] = point.x();
+            yCoords[i] = point.z();
             i++;
         }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegion.java

@@ -92,17 +92,17 @@ public abstract class ProtectedRegion implements ChangeTracked, Comparable<Prote
      * @param points the points to set with at least one entry
      */
     protected void setMinMaxPoints(List<BlockVector3> points) {
-        int minX = points.get(0).getBlockX();
-        int minY = points.get(0).getBlockY();
-        int minZ = points.get(0).getBlockZ();
+        int minX = points.get(0).x();
+        int minY = points.get(0).y();
+        int minZ = points.get(0).z();
         int maxX = minX;
         int maxY = minY;
         int maxZ = minZ;
 
         for (BlockVector3 v : points) {
-            int x = v.getBlockX();
-            int y = v.getBlockY();
-            int z = v.getBlockZ();
+            int x = v.x();
+            int y = v.y();
+            int z = v.z();
 
             if (x < minX) minX = x;
             if (y < minY) minY = y;
@@ -514,7 +514,7 @@ public abstract class ProtectedRegion implements ChangeTracked, Comparable<Prote
      */
     public boolean contains(BlockVector2 position) {
         checkNotNull(position);
-        return contains(BlockVector3.at(position.getBlockX(), min.getBlockY(), position.getBlockZ()));
+        return contains(BlockVector3.at(position.x(), min.y(), position.z()));
     }
 
     /**
@@ -607,16 +607,16 @@ public abstract class ProtectedRegion implements ChangeTracked, Comparable<Prote
         BlockVector3 rMaxPoint = region.getMaximumPoint();
         BlockVector3 min = getMinimumPoint();
 
-        if (rMaxPoint.getBlockX() < min.getBlockX()) return false;
-        if (rMaxPoint.getBlockY() < min.getBlockY()) return false;
-        if (rMaxPoint.getBlockZ() < min.getBlockZ()) return false;
+        if (rMaxPoint.x() < min.x()) return false;
+        if (rMaxPoint.y() < min.y()) return false;
+        if (rMaxPoint.z() < min.z()) return false;
 
         BlockVector3 rMinPoint = region.getMinimumPoint();
         BlockVector3 max = getMaximumPoint();
 
-        if (rMinPoint.getBlockX() > max.getBlockX()) return false;
-        if (rMinPoint.getBlockY() > max.getBlockY()) return false;
-        if (rMinPoint.getBlockZ() > max.getBlockZ()) return false;
+        if (rMinPoint.x() > max.x()) return false;
+        if (rMinPoint.y() > max.y()) return false;
+        if (rMinPoint.z() > max.z()) return false;
 
         return true;
     }
@@ -636,16 +636,16 @@ public abstract class ProtectedRegion implements ChangeTracked, Comparable<Prote
             for (BlockVector2 aPts2 : pts2) {
 
                 Line2D line1 = new Line2D.Double(
-                        lastPt1.getBlockX(),
-                        lastPt1.getBlockZ(),
-                        aPts1.getBlockX(),
-                        aPts1.getBlockZ());
+                        lastPt1.x(),
+                        lastPt1.z(),
+                        aPts1.x(),
+                        aPts1.z());
 
                 if (line1.intersectsLine(
-                        lastPt2.getBlockX(),
-                        lastPt2.getBlockZ(),
-                        aPts2.getBlockX(),
-                        aPts2.getBlockZ())) {
+                        lastPt2.x(),
+                        lastPt2.z(),
+                        aPts2.x(),
+                        aPts2.z())) {
                     return true;
                 }
                 lastPt2 = aPts2;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/regions/ProtectedRegionMBRConverter.java

@@ -30,27 +30,21 @@ public class ProtectedRegionMBRConverter implements MBRConverter<ProtectedRegion
 
     @Override
     public double getMax(int dimension, ProtectedRegion region) {
-        switch (dimension) {
-            case 0:
-                return region.getMaximumPoint().getBlockX();
-            case 1:
-                return region.getMaximumPoint().getBlockY();
-            case 2:
-                return region.getMaximumPoint().getBlockZ();
-        }
-        return 0;
+        return switch (dimension) {
+            case 0 -> region.getMaximumPoint().x();
+            case 1 -> region.getMaximumPoint().y();
+            case 2 -> region.getMaximumPoint().z();
+            default -> 0;
+        };
     }
 
     @Override
     public double getMin(int dimension, ProtectedRegion region) {
-        switch (dimension) {
-            case 0:
-                return region.getMinimumPoint().getBlockX();
-            case 1:
-                return region.getMinimumPoint().getBlockY();
-            case 2:
-                return region.getMinimumPoint().getBlockZ();
-        }
-        return 0;
+        return switch (dimension) {
+            case 0 -> region.getMinimumPoint().x();
+            case 1 -> region.getMinimumPoint().y();
+            case 2 -> region.getMinimumPoint().z();
+            default -> 0;
+        };
     }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java

@@ -21,6 +21,12 @@ package com.sk89q.worldguard.protection.util;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.CustomDomain;
+import com.sk89q.worldguard.domains.registry.CustomDomainContext;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
+import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.util.profile.Profile;
 import com.sk89q.worldguard.util.profile.resolver.ProfileService;
 import com.sk89q.worldguard.util.profile.util.UUIDs;
@@ -43,6 +49,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class DomainInputResolver implements Callable<DefaultDomain> {
 
     private static final Pattern GROUP_PATTERN = Pattern.compile("(?i)^[G]:(.+)$");
+    private static final Pattern CUSTOM_PATTERN = Pattern.compile("(?i)^([A-Za-z0-9\\-]{1,40}):(.*)$");
 
     /**
      * The policy for locating users.
@@ -56,6 +63,8 @@ public class DomainInputResolver implements Callable<DefaultDomain> {
     private final ProfileService profileService;
     private final String[] input;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
+    private ProtectedRegion region;
+    private Actor actor;
 
     /**
      * Create a new instance.
@@ -89,20 +98,54 @@ public class DomainInputResolver implements Callable<DefaultDomain> {
         this.locatorPolicy = locatorPolicy;
     }
 
+    /**
+     * Set the region for the Resolver
+     * @param region the region
+     */
+    public void setRegion(ProtectedRegion region) {
+        this.region = region;
+    }
+
+    /**
+     * Get the current region from the Resolver
+     * @return the region
+     */
+    public @Nullable ProtectedRegion getRegion() {
+        return region;
+    }
+
+    /**
+     * Set the actor of the Resolver
+     * @param actor the actor
+     */
+    public void setActor(Actor actor) {
+        this.actor = actor;
+    }
+
     @Override
-    public DefaultDomain call() throws UnresolvedNamesException {
+    public DefaultDomain call() throws UnresolvedNamesException, InvalidDomainFormatException {
         DefaultDomain domain = new DefaultDomain();
         List<String> namesToQuery = new ArrayList<>();
 
         for (String s : input) {
-            Matcher m = GROUP_PATTERN.matcher(s);
-            if (m.matches()) {
-                domain.addGroup(m.group(1));
+            Matcher groupMatcher = GROUP_PATTERN.matcher(s);
+            Matcher customMatcher = CUSTOM_PATTERN.matcher(s);
+            if (groupMatcher.matches()) {
+                domain.addGroup(groupMatcher.group(1));
+            } else if (customMatcher.matches()) {
+                String domainName = customMatcher.group(1);
+                CustomDomain customDomain = WorldGuard.getInstance().getDomainRegistry().createDomain(domainName);
+                if (customDomain == null) {
+                    throw new InvalidDomainFormatException("No domain named '" + domainName + "' found.");
+                }
+                customDomain.parseInput(CustomDomainContext.create()
+                    .setSender(actor).setInput(customMatcher.group(2)).setObject("region", region).build());
+                domain.addCustomDomain(customDomain);
             } else {
                 UUID uuid = parseUUID(s);
                 if (uuid != null) {
                     // Try to add any UUIDs given
-                    domain.addPlayer(UUID.fromString(UUIDs.addDashes(s.replaceAll("^uuid:", ""))));
+                    domain.addPlayer(uuid);
                 } else {
                     switch (locatorPolicy) {
                         case NAME_ONLY:

worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/WorldEditRegionConverter.java

@@ -50,7 +50,7 @@ public final class WorldEditRegionConverter {
         }
         if (region instanceof ProtectedPolygonalRegion) {
             return new Polygonal2DRegion(null, region.getPoints(),
-                    region.getMinimumPoint().getY(), region.getMaximumPoint().getY());
+                    region.getMinimumPoint().y(), region.getMaximumPoint().y());
         }
         return null;
     }
@@ -68,7 +68,7 @@ public final class WorldEditRegionConverter {
         }
         if (region instanceof ProtectedPolygonalRegion) {
             return new Polygonal2DRegionSelector(null, region.getPoints(),
-                    region.getMinimumPoint().getY(), region.getMaximumPoint().getY());
+                    region.getMinimumPoint().y(), region.getMaximumPoint().y());
         }
         return null;
     }

worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java

@@ -26,6 +26,7 @@ import com.sk89q.worldedit.internal.command.exception.ExceptionMatch;
 import com.sk89q.worldedit.util.auth.AuthorizationException;
 import com.sk89q.worldedit.util.formatting.component.InvalidComponentException;
 import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
 import com.sk89q.worldguard.protection.managers.storage.StorageException;
 import com.sk89q.worldguard.protection.util.UnresolvedNamesException;
 
@@ -91,6 +92,11 @@ public class WorldGuardExceptionConverter extends ExceptionConverterHelper {
         throw newCommandException(e.getMessage(), e);
     }
 
+    @ExceptionMatch
+    public void convert(InvalidDomainFormatException e) throws CommandException {
+        throw newCommandException(e.getMessage(), e);
+    }
+
     @ExceptionMatch
     public void convert(AuthorizationException e) throws CommandException {
         throw newCommandException("You don't have permission to do that.", e);

worldguard-core/src/test/java/com/sk89q/worldguard/domains/CustomUUIDDomain.java

@@ -0,0 +1,64 @@
+/*
+ * 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/>.
+ */
+
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.domains.registry.CustomDomainContext;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class CustomUUIDDomain extends CustomDomain {
+    private UUID test;
+
+    public CustomUUIDDomain(String name, UUID test) {
+        super(name);
+        this.test = test;
+    }
+
+    @Override
+    public void parseInput(CustomDomainContext context) throws InvalidDomainFormatException {
+        throw new InvalidDomainFormatException("not supported");
+    }
+
+    @Override
+    public void unmarshal(Object o) {
+    }
+
+    @Override
+    public Object marshal() {
+        return null;
+    }
+
+    @Override
+    public boolean contains(UUID uniqueId) {
+        return Objects.equals(test, uniqueId);
+    }
+
+    @Override
+    public boolean contains(String playerName) {
+        return false;
+    }
+
+    @Override
+    public void clear() {
+        test = null;
+    }
+}

worldguard-core/src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java

@@ -112,5 +112,11 @@ public class DefaultDomainTest {
         assertFalse(domain.contains(player1));
         assertTrue(domain.contains(player2));
         assertTrue(domain.contains(player3));
+
+        domain = new DefaultDomain();
+        domain.addCustomDomain(new CustomUUIDDomain("test", player2.getUniqueId()));
+        assertTrue(domain.contains(player2));
+        assertFalse(domain.contains(player2.getName()));
+        assertFalse(domain.contains(player3));
     }
 }

worldguard-libs/bukkit/build.gradle.kts

@@ -1 +1,2 @@
 applyLibrariesConfiguration()
+constrainDependenciesToLibsCore()