Synchronize on the class instead of the instance

I didn't realize it before, but it looks like there is at least one instance of YamlRegionFile per world, so synchronizing on the instance wouldn't necessarily help.

.travis.yml

@@ -0,0 +1,8 @@
+language: java
+dist: trusty
+jdk:
+  - oraclejdk11
+notifications:
+  email: false
+before_install: chmod +x gradlew
+script: ./gradlew build -S

CHANGELOG.md

@@ -1,27 +1,7 @@
 # Changelog
 
-## 7.0.12
-
-* Fix a change in the default behavior of explosion flag handling.
-
-## 7.0.11
-
-* Add support for MC 1.21.
-* Add wind-charge-burst flag which is checked along with `use` (for the interaction) or `pvp` (for the knockback).
-* Add breeze-charge-explosion flag for breeze charges (i.e. from the mob, not player wind charges).
-* Add moisture-change flag and config options.
-* Fix an error if a player logged in to an unloaded world.
-* Fix chest boat usage always being counted as ride.
-* Consider potions thrown by mobs as mob-damage.
-* Workaround spigot no longer sending block change events when a book is placed on a lectern.
-* Improve accuracy of target blocks in blacklist/build-perms events.
-
-## 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
+* Add support for MC 1.20
 * Made entities spawned via the `/summon` command get treated as plugin-spawned entities
 * Add sniffer egg trample protection options
 

COMPILING.md

@@ -1,8 +1,11 @@
 Compiling
 =========
 
-You can compile WorldGuard as long as you have some version of Java greater than or equal to 21 installed. 
-Gradle will download JDK 21 specifically if needed, but it needs some version of Java to bootstrap from.
+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.
 
 The build process uses Gradle, which you do *not* need to download. WorldGuard is a multi-module project with three modules:
 

build-logic/build.gradle.kts

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

build-logic/settings.gradle.kts

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

build.gradle.kts

@@ -1,17 +1,26 @@
 import org.ajoberstar.grgit.Grgit
 
-plugins {
-    id("buildlogic.common")
-    id("buildlogic.artifactory-root")
-}
+logger.lifecycle("""
+*******************************************
+ You are building WorldGuard!
+ If you encounter trouble:
+ 1) Try running 'build' in a separate Gradle run
+ 2) Use gradlew and not gradle
+ 3) If you still need help, ask on Discord! https://discord.gg/enginehub
+
+ Output files will be in [subproject]/build/libs
+*******************************************
+""")
+
+applyRootArtifactoryConfig()
 
 if (!project.hasProperty("gitCommitHash")) {
     apply(plugin = "org.ajoberstar.grgit")
     ext["gitCommitHash"] = try {
-        extensions.getByName<Grgit>("grgit").head()?.abbreviatedId
+        Grgit.open(mapOf("currentDir" to project.rootDir))?.head()?.abbreviatedId
     } catch (e: Exception) {
         logger.warn("Error getting commit hash", e)
 
         "no.git.id"
     }
-}
+}

buildSrc/build.gradle.kts

@@ -0,0 +1,17 @@
+plugins {
+    `kotlin-dsl`
+    kotlin("jvm") version embeddedKotlinVersion
+}
+
+repositories {
+    mavenCentral()
+    gradlePluginPortal()
+}
+
+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")
+}

buildSrc/src/main/kotlin/ArtifactoryConfig.kt

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

buildSrc/src/main/kotlin/CommonConfig.kt

@@ -0,0 +1,38 @@
+import org.cadixdev.gradle.licenser.LicenseExtension
+import org.gradle.api.Project
+import org.gradle.api.plugins.JavaPluginExtension
+import org.gradle.jvm.toolchain.JavaLanguageVersion
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.repositories
+import org.gradle.kotlin.dsl.the
+
+fun Project.applyCommonConfiguration() {
+    group = rootProject.group
+    version = rootProject.version
+
+    repositories {
+        mavenCentral()
+        maven { url = uri("https://maven.enginehub.org/repo/") }
+        maven { url = uri("https://oss.sonatype.org/content/repositories/snapshots/") }
+    }
+
+    configurations.all {
+        resolutionStrategy {
+            cacheChangingModulesFor(5, "MINUTES")
+        }
+    }
+
+    plugins.withId("java") {
+        the<JavaPluginExtension>().toolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+
+    apply(plugin = "org.cadixdev.licenser")
+    configure<LicenseExtension> {
+        header(rootProject.file("HEADER.txt"))
+        include("**/*.java")
+        include("**/*.kt")
+    }
+}

buildSrc/src/main/kotlin/GradleExtras.kt

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

buildSrc/src/main/kotlin/LibsConfig.kt

@@ -0,0 +1,187 @@
+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
+import org.gradle.api.attributes.DocsType
+import org.gradle.api.attributes.LibraryElements
+import org.gradle.api.attributes.Usage
+import org.gradle.api.attributes.java.TargetJvmVersion
+import org.gradle.api.component.AdhocComponentWithVariants
+import org.gradle.api.component.SoftwareComponentFactory
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.api.tasks.bundling.Jar
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.invoke
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+import javax.inject.Inject
+
+fun Project.applyLibrariesConfiguration() {
+    applyCommonConfiguration()
+    apply(plugin = "java-base")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.github.johnrengelman.shadow")
+    apply(plugin = "com.jfrog.artifactory")
+
+    configurations {
+        create("shade")
+    }
+
+    group = "${rootProject.group}.worldguard-libs"
+
+    val relocations = mapOf(
+        "org.enginehub.squirrelid" to "com.sk89q.worldguard.util.profile"
+    )
+
+    tasks.register<ShadowJar>("jar") {
+        configurations = listOf(project.configurations["shade"])
+        archiveClassifier.set("")
+
+        dependencies {
+            exclude(dependency("com.google.code.findbugs:jsr305"))
+        }
+
+        relocations.forEach { (from, to) ->
+            relocate(from, to)
+        }
+    }
+    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
+            }
+
+        files(configurations.detachedConfiguration(*deps.toTypedArray())
+            .resolvedConfiguration.lenientConfiguration.artifacts
+            .filter { it.classifier == artifactType }
+            .map { zipTree(it.file) })
+    }
+    tasks.register<Jar>("sourcesJar") {
+        from({
+            altConfigFiles("sources")
+        })
+        relocations.forEach { (from, to) ->
+            val filePattern = Regex("(.*)${from.replace('.', '/')}((?:/|$).*)")
+            val textPattern = Regex.fromLiteral(from)
+            eachFile {
+                filter {
+                    it.replaceFirst(textPattern, to)
+                }
+                path = path.replaceFirst(filePattern, "$1${to.replace('.', '/')}$2")
+            }
+        }
+        archiveClassifier.set("sources")
+    }
+
+    tasks.named("assemble").configure {
+        dependsOn("jar", "sourcesJar")
+    }
+
+    project.apply<LibsConfigPluginHack>()
+
+    val libsComponent = project.components["libs"] as AdhocComponentWithVariants
+
+    val apiElements = project.configurations.register("apiElements") {
+        isVisible = false
+        description = "API elements for libs"
+        isCanBeResolved = false
+        isCanBeConsumed = true
+        attributes {
+            attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_API))
+            attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
+            attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+            attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
+        }
+        outgoing.artifact(tasks.named("jar"))
+    }
+
+    val runtimeElements = project.configurations.register("runtimeElements") {
+        isVisible = false
+        description = "Runtime elements for libs"
+        isCanBeResolved = false
+        isCanBeConsumed = true
+        attributes {
+            attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
+            attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.LIBRARY))
+            attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+            attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, project.objects.named(LibraryElements.JAR))
+            attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8)
+        }
+        outgoing.artifact(tasks.named("jar"))
+    }
+
+    val sourcesElements = project.configurations.register("sourcesElements") {
+        isVisible = false
+        description = "Source elements for libs"
+        isCanBeResolved = false
+        isCanBeConsumed = true
+        attributes {
+            attribute(Usage.USAGE_ATTRIBUTE, project.objects.named(Usage.JAVA_RUNTIME))
+            attribute(Category.CATEGORY_ATTRIBUTE, project.objects.named(Category.DOCUMENTATION))
+            attribute(Bundling.BUNDLING_ATTRIBUTE, project.objects.named(Bundling.SHADOWED))
+            attribute(DocsType.DOCS_TYPE_ATTRIBUTE, project.objects.named(DocsType.SOURCES))
+        }
+        outgoing.artifact(tasks.named("sourcesJar"))
+    }
+
+    libsComponent.addVariantsFromConfiguration(apiElements.get()) {
+        mapToMavenScope("compile")
+    }
+
+    libsComponent.addVariantsFromConfiguration(runtimeElements.get()) {
+        mapToMavenScope("runtime")
+    }
+
+    libsComponent.addVariantsFromConfiguration(sourcesElements.get()) {
+        mapToMavenScope("runtime")
+    }
+
+    configure<PublishingExtension> {
+        publications {
+            register<MavenPublication>("maven") {
+                from(libsComponent)
+            }
+        }
+    }
+
+    applyCommonArtifactoryConfig()
+}
+
+// A horrible hack because `softwareComponentFactory` has to be gotten via plugin
+// gradle why
+internal open class LibsConfigPluginHack @Inject constructor(
+    private val softwareComponentFactory: SoftwareComponentFactory
+) : Plugin<Project> {
+    override fun apply(project: Project) {
+        val libsComponents = softwareComponentFactory.adhoc("libs")
+        project.components.add(libsComponents)
+    }
+}
+
+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

@@ -0,0 +1,68 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.api.Project
+import org.gradle.api.component.AdhocComponentWithVariants
+import org.gradle.api.publish.PublishingExtension
+import org.gradle.api.publish.maven.MavenPublication
+import org.gradle.kotlin.dsl.apply
+import org.gradle.kotlin.dsl.configure
+import org.gradle.kotlin.dsl.get
+import org.gradle.kotlin.dsl.named
+import org.gradle.kotlin.dsl.register
+
+fun Project.applyPlatformAndCoreConfiguration(javaRelease: Int = 17) {
+    applyCommonConfiguration()
+    apply(plugin = "java")
+    apply(plugin = "maven-publish")
+    apply(plugin = "com.jfrog.artifactory")
+    applyCommonJavaConfiguration(
+        sourcesJar = true,
+        javaRelease = javaRelease,
+        banSlf4j = false
+    )
+
+    ext["internalVersion"] = "$version+${rootProject.ext["gitCommitHash"]}"
+
+    configure<PublishingExtension> {
+        publications {
+            register<MavenPublication>("maven") {
+                from(components["java"])
+                versionMapping {
+                    usage("java-api") {
+                        fromResolutionOf("runtimeClasspath")
+                    }
+                    usage("java-runtime") {
+                        fromResolutionResult()
+                    }
+                }
+            }
+        }
+    }
+
+    applyCommonArtifactoryConfig()
+}
+
+fun Project.applyShadowConfiguration() {
+    apply(plugin = "com.github.johnrengelman.shadow")
+    tasks.named<ShadowJar>("shadowJar") {
+        archiveClassifier.set("dist")
+        dependencies {
+            include(project(":worldguard-libs:core"))
+            //include(project(":worldguard-libs:${project.name.replace("worldguard-", "")}"))
+            include(project(":worldguard-core"))
+
+            relocate("org.flywaydb", "com.sk89q.worldguard.internal.flywaydb") {
+                include(dependency("org.flywaydb:flyway-core:3.0"))
+            }
+            exclude("com.google.code.findbugs:jsr305")
+        }
+        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

@@ -0,0 +1,10 @@
+object Versions {
+    //    const val PISTON = "0.4.3"
+    //    const val AUTO_VALUE = "1.6.5"
+    const val WORLDEDIT = "7.2.14"
+    const val JUNIT = "5.9.1"
+    const val MOCKITO = "4.9.0"
+    const val SQUIRRELID = "0.3.2"
+    const val GUAVA = "31.1-jre"
+    const val FINDBUGS = "3.0.2"
+}

config/checkstyle/import-control.xml

@@ -7,6 +7,7 @@
   <allow pkg="javax"/>
   <allow pkg="org.junit"/>
   <allow pkg="org.hamcrest"/>
+  <allow pkg="org.mockito"/>
   <allow pkg="junit.framework"/>
   <allow pkg="com.sk89q"/>
   <allow pkg="com.google.common"/>

gradle.properties

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

gradle/gradle-daemon-jvm.properties

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

gradle/libs.versions.toml

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -83,8 +83,7 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -131,13 +130,10 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    if ! command -v java >/dev/null 2>&1
-    then
-        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
-    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -145,7 +141,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=SC2039,SC3045
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -153,7 +149,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=SC2039,SC3045
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -202,11 +198,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, 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.
+# 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.
 
 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. 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
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo. 1>&2
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
-echo. 1>&2
-echo Please set the JAVA_HOME variable in your environment to match the 1>&2
-echo location of your Java installation. 1>&2
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
 
 goto fail
 

settings.gradle.kts

@@ -1,33 +1,7 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-    }
-}
-plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
-}
-
-logger.lifecycle("""
-*******************************************
- You are building WorldGuard!
-
- If you encounter trouble:
- 1) Read COMPILING.md if you haven't yet
- 2) Try running 'build' in a separate Gradle run
- 3) Use gradlew and not gradle
- 4) If you still need help, ask on Discord! https://discord.gg/enginehub
-
- Output files will be in [subproject]/build/libs
-*******************************************
-""")
-
 rootProject.name = "worldguard"
 
-includeBuild("build-logic")
-
 include("worldguard-libs")
 include("worldguard-libs:core")
-
-listOf("bukkit", "core").forEach {
-    include("worldguard-$it")
-}
+include("worldguard-core")
+//include("worldguard-libs:bukkit")
+include("worldguard-bukkit")

worldguard-bukkit/build.gradle.kts

@@ -2,40 +2,33 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     `java-library`
-    id("buildlogic.platform")
 }
 
-val localImplementation = configurations.create("localImplementation") {
-    description = "Dependencies used locally, but provided by the runtime Bukkit implementation"
-    isCanBeConsumed = false
-    isCanBeResolved = false
+applyPlatformAndCoreConfiguration()
+applyShadowConfiguration()
+
+repositories {
+    maven {
+        name = "paper"
+        url = uri("https://repo.papermc.io/repository/maven-public/")
+    }
+}
+
+configurations {
+    compileClasspath.get().extendsFrom(create("shadeOnly"))
 }
-configurations["compileOnly"].extendsFrom(localImplementation)
-configurations["testImplementation"].extendsFrom(localImplementation)
 
 dependencies {
     "api"(project(":worldguard-core"))
-    "api"(libs.worldedit.bukkit) { isTransitive = false }
-    "compileOnly"(libs.commandbook) { isTransitive = false }
-    // Technically this is api, but everyone should already have some form of the bukkit API
-    // Avoid pulling in another one, especially one so outdated.
-    "localImplementation"(libs.spigot) {
+    "compileOnly"("io.papermc.paper:paper-api:1.20-R0.1-SNAPSHOT")
+    "runtimeOnly"("org.spigotmc:spigot-api:1.20-R0.1-SNAPSHOT") {
         exclude("junit", "junit")
     }
-
-    "compileOnly"(libs.jetbrains.annotations) {
-        because("Resolving Spigot annotations")
-    }
-    "testCompileOnly"(libs.jetbrains.annotations) {
-        because("Resolving Spigot annotations")
-    }
-    "compileOnly"(libs.paperApi) {
-        exclude("org.slf4j", "slf4j-api")
-        exclude("junit", "junit")
-    }
-
-    "implementation"(libs.paperLib)
-    "implementation"(libs.bstats.bukkit)
+    "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
+    "implementation"("com.google.guava:guava:${Versions.GUAVA}")
+    "compileOnly"("com.sk89q:commandbook:2.3") { isTransitive = false }
+    "shadeOnly"("io.papermc:paperlib:1.0.8")
+    "shadeOnly"("org.bstats:bstats-bukkit:3.0.1")
 }
 
 tasks.named<Copy>("processResources") {
@@ -46,23 +39,31 @@ tasks.named<Copy>("processResources") {
     }
 }
 
+tasks.named<Jar>("jar") {
+    val projectVersion = project.version
+    inputs.property("projectVersion", projectVersion)
+    manifest {
+        attributes("Implementation-Version" to projectVersion)
+    }
+}
+
 tasks.named<ShadowJar>("shadowJar") {
+    configurations = listOf(project.configurations["shadeOnly"], project.configurations["runtimeClasspath"])
+
     dependencies {
         include(dependency(":worldguard-core"))
-        include(dependency("org.bstats:"))
-        include(dependency("io.papermc:paperlib"))
-
-        relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats")
-        relocate("io.papermc.lib", "com.sk89q.worldguard.bukkit.paperlib")
+        relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
+            include(dependency("org.bstats:"))
+        }
+        relocate ("io.papermc.lib", "com.sk89q.worldguard.bukkit.paperlib") {
+            include(dependency("io.papermc:paperlib"))
+        }
+        relocate ("co.aikar.timings.lib", "com.sk89q.worldguard.bukkit.timingslib") {
+            include(dependency("co.aikar:minecraft-timings"))
+        }
     }
 }
 
 tasks.named("assemble").configure {
     dependsOn("shadowJar")
 }
-
-configure<PublishingExtension> {
-    publications.named<MavenPublication>("maven") {
-        from(components["java"])
-    }
-}

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

@@ -55,6 +55,23 @@ public class BukkitUtil {
         return item.getDurability() & 0x3F;
     }
 
+    /**
+     * Get a blacklist target for the given block.
+     *
+     * @param block the block
+     * @param effectiveMaterial The effective material, if different
+     * @return a target
+     */
+    public static Target createTarget(Block block, Material effectiveMaterial) {
+        checkNotNull(block);
+        checkNotNull(block.getType());
+        if (block.getType() == effectiveMaterial) {
+            return createTarget(block.getType());
+        } else {
+            return createTarget(effectiveMaterial);
+        }
+    }
+
     /**
      * Get a blacklist target for the given block.
      *

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

@@ -215,7 +215,6 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
         blockEnderDragonPortalCreation = getBoolean("mobs.block-enderdragon-portal-creation", false);
         blockFireballExplosions = getBoolean("mobs.block-fireball-explosions", false);
         blockFireballBlockDamage = getBoolean("mobs.block-fireball-block-damage", false);
-        blockWindChargeExplosions = getBoolean("mobs.block-windcharge-explosions", false);
         antiWolfDumbness = getBoolean("mobs.anti-wolf-dumbness", false);
         allowTamedSpawns = getBoolean("mobs.allow-tamed-spawns", true);
         disableEndermanGriefing = getBoolean("mobs.disable-enderman-griefing", false);
@@ -283,7 +282,6 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
         disableSculkGrowth = getBoolean("dynamics.disable-sculk-growth", false);
         disableCropGrowth = getBoolean("dynamics.disable-crop-growth", false);
         disableSoilDehydration = getBoolean("dynamics.disable-soil-dehydration", false);
-        disableSoilMoistureChange = getBoolean("dynamics.disable-soil-moisture-change", false);
         disableCoralBlockFade = getBoolean("dynamics.disable-coral-block-fade", false);
         disableCopperBlockFade = getBoolean("dynamics.disable-copper-block-fade", false);
         allowedSnowFallOver = new HashSet<>(convertLegacyBlocks(getStringList("dynamics.snow-fall-blocks", null)));

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().y()),
+                            spawnLoc.subtract(radius, 0, radius).withY(world.getMinimumPoint().getY()),
                             spawnLoc.add(radius, 0, radius).withY(world.getMaxY()));
                 }
             }

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

@@ -96,7 +96,7 @@ public class BlacklistListener extends AbstractListener {
         event.filter(target -> {
             if (!wcfg.getBlacklist().check(
                     new BlockBreakBlacklistEvent(localPlayer, BukkitAdapter.asBlockVector(target),
-                            createTarget(target.getBlock())), false, false)) {
+                            createTarget(target.getBlock(), event.getEffectiveMaterial())), false, false)) {
                 return false;
             } else if (!wcfg.getBlacklist().check(
                     new ItemDestroyWithBlacklistEvent(localPlayer, BukkitAdapter.asBlockVector(target),
@@ -124,7 +124,7 @@ public class BlacklistListener extends AbstractListener {
 
         final LocalPlayer localPlayer = getPlugin().wrapPlayer(player);
         event.filter(target -> wcfg.getBlacklist().check(new BlockPlaceBlacklistEvent(
-                localPlayer, BukkitAdapter.asBlockVector(target), createTarget(target.getBlock())), false, false));
+                localPlayer, BukkitAdapter.asBlockVector(target), createTarget(target.getBlock(), event.getEffectiveMaterial())), false, false));
     }
 
     @EventHandler(ignoreCancelled = true)
@@ -143,7 +143,7 @@ public class BlacklistListener extends AbstractListener {
 
         final LocalPlayer localPlayer = getPlugin().wrapPlayer(player);
         event.filter(target -> wcfg.getBlacklist().check(new BlockInteractBlacklistEvent(
-                localPlayer, BukkitAdapter.asBlockVector(target), createTarget(target.getBlock())), false, false));
+                localPlayer, BukkitAdapter.asBlockVector(target), createTarget(target.getBlock(), event.getEffectiveMaterial())), false, false));
     }
 
     @EventHandler(ignoreCancelled = true)

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

@@ -35,10 +35,6 @@ 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.
@@ -54,50 +50,43 @@ 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 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;
+        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);
                 }
-                player.sendMessage(ChatColor.RED + "Sorry, arrows with "
-                        + blockedEffect.getName() + " are presently disabled.");
             }
-            event.setCancelled(true);
         }
     }
 
@@ -115,20 +104,25 @@ public class BlockedPotionsListener extends AbstractListener {
         if (!wcfg.blockPotions.isEmpty()) {
             PotionEffectType blockedEffect = null;
 
-            if (!(item.getItemMeta() instanceof PotionMeta meta)) {
-                return;
+            PotionMeta meta;
+            if (item.getItemMeta() instanceof PotionMeta) {
+                meta = ((PotionMeta) item.getItemMeta());
+            } else {
+                return; // ok...?
             }
 
             // Find the first blocked effect
-            List<PotionEffect> effects = new ArrayList<>();
-            if (meta.getBasePotionType() != null) {
-                effects.addAll(meta.getBasePotionType().getPotionEffects());
+            PotionEffectType baseEffect = meta.getBasePotionData().getType().getEffectType();
+            if (wcfg.blockPotions.contains(baseEffect)) {
+                blockedEffect = baseEffect;
             }
-            effects.addAll(meta.getCustomEffects());
-            for (PotionEffect potionEffect : effects) {
-                if (wcfg.blockPotions.contains(potionEffect.getType())) {
-                    blockedEffect = potionEffect.getType();
-                    break;
+
+            if (blockedEffect == null && meta.hasCustomEffects()) {
+                for (PotionEffect effect : meta.getCustomEffects()) {
+                    if (wcfg.blockPotions.contains(effect.getType())) {
+                        blockedEffect = effect.getType();
+                        break;
+                    }
                 }
             }
 

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

@@ -101,14 +101,12 @@ public class BuildPermissionListener extends AbstractListener {
 
         if (rootCause instanceof Player) {
             final Player player = (Player) rootCause;
+            final Material material = event.getEffectiveMaterial();
 
-            boolean blocked = event.filter(loc -> {
-                String blacklistName = loc.getBlock().getType().name().toLowerCase();
-                return hasBuildPermission(player, "block." + blacklistName + ".interact") ||
-                        hasBuildPermission(player, "block.interact." + blacklistName);
-            }, true);
-            if (blocked && !event.isSilent()) {
+            if (!hasBuildPermission(player, "block." + material.name().toLowerCase() + ".interact")
+                    && !hasBuildPermission(player, "block.interact." + material.name().toLowerCase())) {
                 tellErrorMessage(player, event.getWorld());
+                event.setCancelled(true);
             }
         }
     }

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

@@ -47,10 +47,8 @@ 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.ExplosionResult;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
@@ -67,8 +65,6 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Dispenser;
 import org.bukkit.entity.AreaEffectCloud;
-import org.bukkit.entity.Arrow;
-import org.bukkit.entity.BreezeWindCharge;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
@@ -82,7 +78,6 @@ import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.ThrownPotion;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.entity.minecart.HopperMinecart;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
@@ -116,10 +111,8 @@ import org.bukkit.event.entity.EntityDamageByBlockEvent;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.EntityEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
-import org.bukkit.event.entity.EntityKnockbackByEntityEvent;
 import org.bukkit.event.entity.EntityPickupItemEvent;
 import org.bukkit.event.entity.EntityTameEvent;
 import org.bukkit.event.entity.EntityUnleashEvent;
@@ -152,6 +145,7 @@ 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;
 
@@ -182,11 +176,9 @@ public class EventAbstractionListener extends AbstractListener {
     public void registerEvents() {
         super.registerEvents();
 
-        PluginManager pm = getPlugin().getServer().getPluginManager();
         if (PaperLib.isPaper()) {
+            PluginManager pm = getPlugin().getServer().getPluginManager();
             pm.registerEvents(new EventAbstractionListener.PaperListener(), getPlugin());
-        } else {
-            pm.registerEvents(new EventAbstractionListener.SpigotListener(), getPlugin());
         }
     }
 
@@ -226,8 +218,8 @@ public class EventAbstractionListener extends AbstractListener {
             Events.fireToCancel(event, new BreakBlockEvent(event, create(event.getPlayer()), previousState.getLocation(), previousState.getType()));
         }
 
-        ItemStack itemStack = event.getItemInHand();
-        if (!event.isCancelled() && itemStack.getType() != Material.AIR) {
+        if (!event.isCancelled()) {
+            ItemStack itemStack = new ItemStack(event.getBlockPlaced().getType(), 1);
             Events.fireToCancel(event, new UseItemEvent(event, create(event.getPlayer()), event.getPlayer().getWorld(), itemStack));
         }
 
@@ -331,10 +323,10 @@ public class EventAbstractionListener extends AbstractListener {
 
         // Fire two events: one as BREAK and one as PLACE
         if (toType != Material.AIR && fromType != Material.AIR) {
-            BreakBlockEvent breakDelegate = new BreakBlockEvent(event, cause, block);
-            setDelegateEventMaterialOptions(breakDelegate, fromType, toType);
+            BreakBlockEvent breakDelagate = new BreakBlockEvent(event, cause, block);
+            setDelegateEventMaterialOptions(breakDelagate, fromType, toType);
             boolean denied;
-            if (!(denied = Events.fireToCancel(event, breakDelegate))) {
+            if (!(denied = Events.fireToCancel(event, breakDelagate))) {
                 PlaceBlockEvent placeDelegate = new PlaceBlockEvent(event, cause, block.getLocation(), toType);
                 setDelegateEventMaterialOptions(placeDelegate, fromType, toType);
                 denied = Events.fireToCancel(event, placeDelegate);
@@ -362,29 +354,10 @@ public class EventAbstractionListener extends AbstractListener {
 
     }
 
-    private static <T  extends EntityEvent & Cancellable> void handleKnockback(T event, Entity damager) {
-        final DamageEntityEvent eventToFire = new DamageEntityEvent(event, create(damager), event.getEntity());
-        if (damager instanceof BreezeWindCharge) {
-            eventToFire.getRelevantFlags().add(Flags.BREEZE_WIND_CHARGE);
-        } else if (damager instanceof WindCharge) {
-            eventToFire.getRelevantFlags().add(Flags.WIND_CHARGE_BURST);
-        }
-        Events.fireToCancel(event, eventToFire);
-    }
-
-    @SuppressWarnings("UnstableApiUsage")
     @EventHandler(ignoreCancelled = true)
     public void onEntityExplode(EntityExplodeEvent event) {
         Entity entity = event.getEntity();
-        if (event.getExplosionResult() == ExplosionResult.TRIGGER_BLOCK) {
-            UseBlockEvent useEvent = new UseBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR);
-            useEvent.getRelevantFlags().add(Entities.getExplosionFlag(entity));
-            useEvent.setSilent(true);
-            Events.fireBulkEventToCancel(event, useEvent);
-        } else if (event.getExplosionResult() == ExplosionResult.DESTROY || event.getExplosionResult() == ExplosionResult.DESTROY_WITH_DECAY) {
-            Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR));
-        }
-
+        Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR));
         if (entity instanceof Creeper) {
             Cause.untrackParentCause(entity);
         }
@@ -509,7 +482,7 @@ public class EventAbstractionListener extends AbstractListener {
                         firedEvent.setSilent(true);
                     }
                     interactDebounce.debounce(clicked, event.getPlayer(), event, firedEvent);
-                    if (event.useInteractedBlock() == Result.DENY && !firedEvent.isSilent()) {
+                    if (event.useInteractedBlock() == Result.DENY) {
                         playDenyEffect(player, clicked.getLocation().add(0, 1, 0));
                     }
                 }
@@ -603,7 +576,7 @@ public class EventAbstractionListener extends AbstractListener {
 
     @EventHandler(ignoreCancelled = true)
     public void onBlockFertilize(BlockFertilizeEvent event) {
-        if (event.getBlocks().isEmpty()) return;
+        if (event.getBlocks().isEmpty()) return; 
         Cause cause = create(event.getPlayer(), event.getBlock());
         Events.fireToCancel(event, new PlaceBlockEvent(event, cause, event.getBlock().getWorld(), event.getBlocks()));
     }
@@ -769,7 +742,7 @@ public class EventAbstractionListener extends AbstractListener {
             if (event.isCancelled() && remover instanceof Player) {
                 playDenyEffect((Player) remover, event.getEntity().getLocation());
             }
-        } else if (event.getCause() == HangingBreakEvent.RemoveCause.EXPLOSION) {
+        } else if (event.getCause() == HangingBreakEvent.RemoveCause.EXPLOSION){
             DestroyEntityEvent destroyEntityEvent = new DestroyEntityEvent(event, Cause.unknown(), event.getEntity());
             destroyEntityEvent.getRelevantFlags().add(Flags.OTHER_EXPLOSION);
             if (event.getEntity() instanceof ItemFrame) {
@@ -914,19 +887,11 @@ public class EventAbstractionListener extends AbstractListener {
 
     @EventHandler(ignoreCancelled = true)
     public void onEntityCombust(EntityCombustEvent event) {
-        if (event instanceof EntityCombustByBlockEvent combustByBlockEvent) {
+        if (event instanceof EntityCombustByBlockEvent) {
             // at the time of writing, spigot is throwing null for the event's combuster. this causes lots of issues downstream.
             // whenever (i mean if ever) it is fixed, use getCombuster again instead of the current block
-            Block combuster = combustByBlockEvent.getCombuster();
-            Events.fireToCancel(event, new DamageEntityEvent(event,
-                    create(combuster == null ? event.getEntity().getLocation().getBlock() : combuster), event.getEntity()));
+            Events.fireToCancel(event, new DamageEntityEvent(event, create(event.getEntity().getLocation().getBlock()), event.getEntity()));
         } else if (event instanceof EntityCombustByEntityEvent) {
-            if (event.getEntity() instanceof Arrow) {
-                // this only happens from the Flame enchant. igniting arrows in other ways (eg with lava) doesn't even
-                // throw the combust event, not even the CombustByBlock event... they're also very buggy and don't even
-                // show as lit on the client consistently
-                return;
-            }
             Events.fireToCancel(event, new DamageEntityEvent(event, create(((EntityCombustByEntityEvent) event).getCombuster()), event.getEntity()));
         }
     }
@@ -1042,6 +1007,7 @@ public class EventAbstractionListener extends AbstractListener {
 
         // Fire item interaction event
         Events.fireToCancel(event, new UseItemEvent(event, cause, world, potion.getItem()));
+
         // Fire entity interaction event
         if (!event.isCancelled()) {
             int blocked = 0;
@@ -1053,11 +1019,8 @@ public class EventAbstractionListener extends AbstractListener {
                         ? new DamageEntityEvent(event, cause, affected) :
                         new UseEntityEvent(event, cause, affected);
 
-                // Consider extra relevant flags
+                // Consider the potion splash flag
                 delegate.getRelevantFlags().add(Flags.POTION_SPLASH);
-                if (potion.getShooter() instanceof LivingEntity shooter && !(shooter instanceof Player) && affected instanceof Player) {
-                    delegate.getRelevantFlags().add(Flags.MOB_DAMAGE);
-                }
 
                 if (Events.fireAndTestCancel(delegate)) {
                     event.setIntensity(affected, 0);
@@ -1123,9 +1086,9 @@ public class EventAbstractionListener extends AbstractListener {
     public void onLingeringApply(AreaEffectCloudApplyEvent event) {
         AreaEffectCloud entity = event.getEntity();
         List<PotionEffect> effects = new ArrayList<>();
-        List<PotionEffect> baseEffectTypes = entity.getBasePotionType() == null ? null : entity.getBasePotionType().getPotionEffects();
-        if (baseEffectTypes != null) {
-            effects.addAll(baseEffectTypes);
+        PotionEffectType baseEffectType = entity.getBasePotionData().getType().getEffectType();
+        if (baseEffectType != null) {
+            effects.add(new PotionEffect(baseEffectType, 0, 0));
         }
         if (entity.hasCustomEffects()) {
             effects.addAll(entity.getCustomEffects());
@@ -1139,7 +1102,7 @@ public class EventAbstractionListener extends AbstractListener {
     }
 
     @EventHandler(ignoreCancelled = true)
-    public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event) {
+    public void onPlayerInteractAtEntity(PlayerInteractAtEntityEvent event){
         onPlayerInteractEntity(event);
     }
 
@@ -1210,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.END_CRYSTAL));
+            Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), EntityType.ENDER_CRYSTAL));
             return;
         }
 
@@ -1250,9 +1213,9 @@ public class EventAbstractionListener extends AbstractListener {
                     useBlockEvent.setAllowed(true);
                 }
                 Events.fireToCancel(originalEvent, useBlockEvent);
-            } else if (holder instanceof DoubleChest doubleChest) {
-                InventoryHolder left = PaperLib.isPaper() ? doubleChest.getLeftSide(false) : doubleChest.getLeftSide();
-                InventoryHolder right = PaperLib.isPaper() ? doubleChest.getRightSide(false) : doubleChest.getRightSide();
+            } else if (holder instanceof DoubleChest) {
+                InventoryHolder left = ((DoubleChest) holder).getLeftSide();
+                InventoryHolder right = ((DoubleChest) holder).getRightSide();
                 if (left instanceof Chest) {
                     Events.fireToCancel(originalEvent, new UseBlockEvent(originalEvent, cause, ((Chest) left).getBlock()));
                 }
@@ -1298,31 +1261,10 @@ public class EventAbstractionListener extends AbstractListener {
         }
     }
 
-    private static class PaperListener implements Listener {
+    private class PaperListener implements Listener {
         @EventHandler(ignoreCancelled = true)
         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()));
-            }
-        }
-
-        @EventHandler(ignoreCancelled = true)
-        public void onEntityKnockbackByEntity(com.destroystokyo.paper.event.entity.EntityKnockbackByEntityEvent event) {
-            handleKnockback(event, event.getHitBy());
-        }
-    }
-
-    @SuppressWarnings("removal")
-    private static class SpigotListener implements Listener {
-        @EventHandler(ignoreCancelled = true)
-        public void onEntityKnockbackByEntity(EntityKnockbackByEntityEvent event) {
-            handleKnockback(event, event.getSourceEntity());
-        }
     }
 }

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

@@ -25,6 +25,7 @@ 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;
@@ -33,13 +34,14 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
-import org.bukkit.event.entity.EntityMountEvent;
+import org.bukkit.event.Listener;
 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 {
 
@@ -52,10 +54,13 @@ 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(priority = EventPriority.MONITOR)
+    @EventHandler
     public void onPlayerRespawn(PlayerRespawnEvent event) {
         LocalPlayer player = getPlugin().wrapPlayer(event.getPlayer());
 
@@ -147,14 +152,16 @@ public class PlayerMoveListener extends AbstractListener {
         session.uninitialize(localPlayer);
     }
 
-    @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);
+    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);
+                }
             }
         }
     }

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.SNOW_GOLEM) != null) {
+        if (event.getCause().find(EntityType.SNOWMAN) != 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.END_CRYSTAL) != null) { // EnderCrystal
+        if (event.getCause().find(EntityType.ENDER_CRYSTAL) != null) { // EnderCrystal
             event.filter(testState(query, Flags.OTHER_EXPLOSION), config.explosionFlagCancellation);
         }
 

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

@@ -61,7 +61,6 @@ import org.bukkit.entity.Tameable;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Result;
 import org.bukkit.event.EventHandler;
-import org.bukkit.event.inventory.InventoryOpenEvent;
 import org.bukkit.event.player.PlayerTakeLecternBookEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
 
@@ -174,7 +173,7 @@ public class RegionProtectionListener extends AbstractListener {
             /* Flint and steel, fire charge, etc. */
             if (Materials.isFire(type)) {
                 Block block = event.getCause().getFirstBlock();
-                boolean fire = block != null && Materials.isFire(block.getType());
+                boolean fire = block != null && Materials.isFire(type);
                 boolean lava = block != null && Materials.isLava(block.getType());
                 List<StateFlag> flags = new ArrayList<>();
                 flags.add(Flags.BLOCK_PLACE);
@@ -219,7 +218,7 @@ public class RegionProtectionListener extends AbstractListener {
                 String what;
 
                 /* TNT */
-                if (event.getCause().find(EntityType.TNT, EntityType.TNT_MINECART) != null) {
+                if (event.getCause().find(EntityType.PRIMED_TNT, EntityType.MINECART_TNT) != null) {
                     canBreak = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.BLOCK_BREAK, Flags.TNT));
                     what = "use dynamite";
 
@@ -245,13 +244,13 @@ public class RegionProtectionListener extends AbstractListener {
         if (!isRegionSupportEnabled(event.getWorld())) return; // Region support disabled
         if (isWhitelisted(event.getCause(), event.getWorld(), false)) return; // Whitelisted cause
 
+        final Material type = event.getEffectiveMaterial();
         final RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
         final RegionAssociable associable = createRegionAssociable(event.getCause());
 
         event.filter((Predicate<Location>) target -> {
             boolean canUse;
             String what;
-            final Material type = target.getBlock().getType();
 
             /* Saplings, etc. */
             if (Materials.isConsideredBuildingIfUsed(type)) {
@@ -411,15 +410,13 @@ public class RegionProtectionListener extends AbstractListener {
             canUse = event.getRelevantFlags().isEmpty() || query.queryState(BukkitAdapter.adapt(target), associable, combine(event)) != State.DENY;
             what = "use that";
         /* Paintings, item frames, etc. */
-        } else if (Entities.isConsideredBuildingIfUsed(entity)
-                // weird case since sneak+interact is chest access and not ride
-                || type == EntityType.CHEST_BOAT && event.getOriginalEvent() instanceof InventoryOpenEvent) {
+        } else if (Entities.isConsideredBuildingIfUsed(entity)) {
             if ((type == EntityType.ITEM_FRAME || type == EntityType.GLOW_ITEM_FRAME)
                     && event.getCause().getFirstPlayer() != null
                     && ((ItemFrame) entity).getItem().getType() != Material.AIR) {
                 canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.ITEM_FRAME_ROTATE));
                 what = "change that";
-            } else if (Entities.isMinecart(type) || type == EntityType.CHEST_BOAT) {
+            } else if (Entities.isMinecart(type)) {
                 canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.CHEST_ACCESS));
                 what = "open that";
             } else {

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

@@ -56,7 +56,6 @@ import org.bukkit.event.block.BlockRedstoneEvent;
 import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.LeavesDecayEvent;
-import org.bukkit.event.block.MoistureChangeEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.Damageable;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -471,6 +470,7 @@ public class WorldGuardBlockListener extends AbstractListener {
     public void onBlockForm(BlockFormEvent event) {
         ConfigurationManager cfg = getConfig();
 
+
         if (cfg.activityHaltToggle) {
             event.setCancelled(true);
             return;
@@ -521,18 +521,6 @@ public class WorldGuardBlockListener extends AbstractListener {
                 return;
             }
         }
-
-        if (Materials.isUnwaxedCopper(event.getBlock().getType())) {
-            if (wcfg.disableCopperBlockFade) {
-                event.setCancelled(true);
-                return;
-            }
-            if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
-                    .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) {
-                event.setCancelled(true);
-                return;
-            }
-        }
     }
 
     /*
@@ -709,6 +697,16 @@ public class WorldGuardBlockListener extends AbstractListener {
                 event.setCancelled(true);
                 return;
             }
+        } else if (Materials.isUnwaxedCopper(event.getBlock().getType())) {
+            if (wcfg.disableCopperBlockFade) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
+                    .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.COPPER_FADE))) {
+                event.setCancelled(true);
+                return;
+            }
         }
     }
 
@@ -727,24 +725,4 @@ public class WorldGuardBlockListener extends AbstractListener {
         }
     }
 
-    /**
-     * Called when the moisture level of a block changes
-     */
-    @EventHandler(ignoreCancelled = true)
-    public void onMoistureChange(MoistureChangeEvent event) {
-        WorldConfiguration wcfg = getWorldConfig(event.getBlock().getWorld());
-
-        if (wcfg.disableSoilMoistureChange) {
-            event.setCancelled(true);
-            return;
-        }
-
-        if (wcfg.useRegions) {
-            if (!StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
-                    .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.MOISTURE_CHANGE))) {
-                event.setCancelled(true);
-            }
-        }
-    }
-
 }

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

@@ -44,7 +44,6 @@ import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockState;
-import org.bukkit.entity.AbstractWindCharge;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Creeper;
 import org.bukkit.entity.EnderCrystal;
@@ -61,7 +60,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
-import org.bukkit.entity.WindCharge;
 import org.bukkit.entity.Wither;
 import org.bukkit.entity.WitherSkull;
 import org.bukkit.entity.Wolf;
@@ -313,17 +311,13 @@ public class WorldGuardEntityListener extends AbstractListener {
                         return;
                     }
                 }
-                if (event.getDamager() instanceof Fireball fireball) {
+                if (event.getDamager() instanceof Fireball) {
+                    Fireball fireball = (Fireball) event.getDamager();
                     if (fireball instanceof WitherSkull) {
                         if (wcfg.blockWitherSkullExplosions) {
                             event.setCancelled(true);
                             return;
                         }
-                    } else if (fireball instanceof AbstractWindCharge) {
-                        if (wcfg.blockWindChargeExplosions) {
-                            event.setCancelled(true);
-                            return;
-                        }
                     } else {
                         if (wcfg.blockFireballExplosions) {
                             event.setCancelled(true);
@@ -332,7 +326,7 @@ public class WorldGuardEntityListener extends AbstractListener {
                     }
                     if (wcfg.useRegions) {
                         RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery();
-                        if (!query.testState(localPlayer.getLocation(), localPlayer, Entities.getExplosionFlag(event.getDamager())) && wcfg.explosionFlagCancellation) {
+                        if (!query.testState(localPlayer.getLocation(), localPlayer, Flags.GHAST_FIREBALL) && wcfg.explosionFlagCancellation) {
                             event.setCancelled(true);
                             return;
                         }
@@ -489,11 +483,6 @@ public class WorldGuardEntityListener extends AbstractListener {
                     event.blockList().clear();
                     return;
                 }
-            } else if (ent instanceof AbstractWindCharge) {
-                if (wcfg.blockWindChargeExplosions) {
-                    event.setCancelled(true);
-                    return;
-                }
             } else {
                 if (wcfg.blockFireballExplosions) {
                     event.setCancelled(true);
@@ -504,10 +493,10 @@ public class WorldGuardEntityListener extends AbstractListener {
                     return;
                 }
             }
-            if (wcfg.useRegions && !(ent instanceof WindCharge)) {
+            // allow wither skull blocking since there is no dedicated flag atm
+            if (wcfg.useRegions) {
                 for (Block block : event.blockList()) {
-                    if (!WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
-                            .testState(BukkitAdapter.adapt(block.getLocation()), null, Entities.getExplosionFlag(ent))) {
+                    if (!WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(block.getLocation())).testState(null, Flags.GHAST_FIREBALL)) {
                         event.blockList().clear();
                         if (wcfg.explosionFlagCancellation) event.setCancelled(true);
                         return;
@@ -525,8 +514,8 @@ public class WorldGuardEntityListener extends AbstractListener {
             }
             if (wcfg.useRegions) {
                 for (Block block : event.blockList()) {
-                    if (!WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
-                            .testState(BukkitAdapter.adapt(block.getLocation()), null, Flags.WITHER_DAMAGE)) {
+                    if (!StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().queryState(BukkitAdapter.adapt(block.getLocation()),
+                            (RegionAssociable) null, Flags.WITHER_DAMAGE))) {
                         event.blockList().clear();
                         event.setCancelled(true);
                         return;
@@ -541,8 +530,7 @@ public class WorldGuardEntityListener extends AbstractListener {
             }
             if (wcfg.useRegions) {
                 for (Block block : event.blockList()) {
-                    if (!WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
-                            .testState(BukkitAdapter.adapt(block.getLocation()), null, Flags.OTHER_EXPLOSION)) {
+                    if (!WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(block.getLocation())).testState(null, Flags.OTHER_EXPLOSION)) {
                         event.blockList().clear();
                         if (wcfg.explosionFlagCancellation) event.setCancelled(true);
                         return;
@@ -551,6 +539,7 @@ public class WorldGuardEntityListener extends AbstractListener {
             }
         }
 
+
         if (wcfg.signChestProtection) {
             for (Block block : event.blockList()) {
                 if (wcfg.isChestProtected(BukkitAdapter.adapt(block.getLocation()))) {
@@ -597,17 +586,12 @@ public class WorldGuardEntityListener extends AbstractListener {
                 event.setCancelled(true);
                 return;
             }
-        } else if (event.getEntityType() == EntityType.TNT
-                || event.getEntityType() == EntityType.TNT_MINECART) {
+        } else if (event.getEntityType() == EntityType.PRIMED_TNT
+                || event.getEntityType() == EntityType.MINECART_TNT) {
             if (wcfg.blockTNTExplosions) {
                 event.setCancelled(true);
                 return;
             }
-        } else if (event instanceof AbstractWindCharge) {
-            if (wcfg.blockWindChargeExplosions) {
-                event.setCancelled(true);
-                return;
-            }
         }
     }
 

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

@@ -350,11 +350,6 @@ public class WorldGuardPlayerListener extends AbstractListener {
 
     @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
     public void onPlayerTeleport(PlayerTeleportEvent event) {
-        if (event.getTo() == null) {
-            // The target location for PlayerTeleportEvents can be null.
-            // Those events will be ignored by the server, so we can ignore them too.
-            return;
-        }
         Player player = event.getPlayer();
         if (com.sk89q.worldguard.bukkit.util.Entities.isNPC(player)) return;
         LocalPlayer localPlayer = getPlugin().wrapPlayer(player);

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 = PaperLib.isPaper() ? doubleChest.getLeftSide(false) : doubleChest.getLeftSide();
+                InventoryHolder left = doubleChest.getLeftSide();
                 if (left instanceof Chest chest) {
                     return new BlockMaterialKey(chest);
                 } else {

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

@@ -19,21 +19,15 @@
 
 package com.sk89q.worldguard.bukkit.util;
 
-import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.StateFlag;
 import org.bukkit.entity.Allay;
 import org.bukkit.entity.Ambient;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Arrow;
-import org.bukkit.entity.BreezeWindCharge;
 import org.bukkit.entity.Creature;
-import org.bukkit.entity.Creeper;
 import org.bukkit.entity.EnderCrystal;
 import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
-import org.bukkit.entity.Fireball;
-import org.bukkit.entity.Firework;
 import org.bukkit.entity.Flying;
 import org.bukkit.entity.Hanging;
 import org.bukkit.entity.LivingEntity;
@@ -49,14 +43,11 @@ import org.bukkit.entity.Steerable;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.entity.WindCharge;
-import org.bukkit.entity.Wither;
 import org.bukkit.entity.minecart.ExplosiveMinecart;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.projectiles.ProjectileSource;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public final class Entities {
@@ -136,8 +127,8 @@ public final class Entities {
      */
     public static boolean isMinecart(EntityType type) {
         return switch(type) {
-            case MINECART, CHEST_MINECART, COMMAND_BLOCK_MINECART, FURNACE_MINECART,
-                 HOPPER_MINECART, SPAWNER_MINECART, TNT_MINECART -> true;
+            case MINECART, MINECART_CHEST, MINECART_COMMAND, MINECART_FURNACE,
+                    MINECART_HOPPER, MINECART_MOB_SPAWNER, MINECART_TNT -> true;
             default -> false;
         };
     }
@@ -246,7 +237,7 @@ public final class Entities {
      * This is true for custom creations or the summon command.
      *
      * @param spawnReason the reason
-     * @return true if considered plugin spawning
+     * @return true if considerd plugin spawning
      */
     public static boolean isPluginSpawning(CreatureSpawnEvent.SpawnReason spawnReason) {
         return switch (spawnReason) {
@@ -254,24 +245,4 @@ public final class Entities {
             default -> false;
         };
     }
-
-    /**
-     * Get the explosion flag relevant for an entity type.
-     * @param entity the entity
-     * @return the relevant StateFlag or OTHER_EXPLOSION if none is matching
-     */
-    public static @Nonnull StateFlag getExplosionFlag(Entity entity) {
-        return switch (entity) {
-            case BreezeWindCharge breezeWindCharge -> Flags.BREEZE_WIND_CHARGE;
-            case WindCharge windCharge -> Flags.WIND_CHARGE_BURST;
-            case Firework firework -> Flags.FIREWORK_DAMAGE;
-            case Fireball fireball -> Flags.GHAST_FIREBALL;
-            case Wither wither -> Flags.WITHER_DAMAGE;
-            case Creeper creeper -> Flags.CREEPER_EXPLOSION;
-            case TNTPrimed tnt -> Flags.TNT;
-            case ExplosiveMinecart minecart -> Flags.TNT;
-            case EnderDragon dragon -> Flags.ENDERDRAGON_BLOCK_DAMAGE;
-            case null, default -> Flags.OTHER_EXPLOSION;
-        };
-    }
 }

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

@@ -53,9 +53,9 @@ public final class Materials {
     private static final Set<PotionEffectType> DAMAGE_EFFECTS = new HashSet<>();
 
     private static void putMaterialTag(Tag<Material> tag, Integer value) {
-        if (tag == null) return;
         tag.getValues().forEach(mat -> MATERIAL_FLAGS.put(mat, value));
     }
+    private static Tag<Material> SIGNS_TAG;
 
     static {
         ENTITY_ITEMS.put(EntityType.PAINTING, Material.PAINTING);
@@ -63,26 +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.EXPERIENCE_BOTTLE, Material.EXPERIENCE_BOTTLE);
+        ENTITY_ITEMS.put(EntityType.THROWN_EXP_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.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.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.BOAT, Material.OAK_BOAT);
         ENTITY_ITEMS.put(EntityType.MINECART, Material.MINECART);
-        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.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.EGG, Material.EGG);
         ENTITY_ITEMS.put(EntityType.ARMOR_STAND, Material.ARMOR_STAND);
-        ENTITY_ITEMS.put(EntityType.END_CRYSTAL, Material.END_CRYSTAL);
-
-        // preset some tags to a default value, override some of them:
-        putMaterialTag(Tag.DOORS, MODIFIED_ON_RIGHT);
-        putMaterialTag(Tag.TRAPDOORS, MODIFIED_ON_RIGHT);
+        ENTITY_ITEMS.put(EntityType.ENDER_CRYSTAL, Material.END_CRYSTAL);
 
         MATERIAL_FLAGS.put(Material.AIR, 0);
         MATERIAL_FLAGS.put(Material.STONE, 0);
@@ -104,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.SHORT_GRASS, 0);
+        MATERIAL_FLAGS.put(Material.GRASS, 0);
         MATERIAL_FLAGS.put(Material.DEAD_BUSH, 0);
         MATERIAL_FLAGS.put(Material.PISTON, 0);
         MATERIAL_FLAGS.put(Material.PISTON_HEAD, 0);
@@ -154,6 +150,12 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.CAKE, MODIFIED_ON_RIGHT);
         MATERIAL_FLAGS.put(Material.REPEATER, MODIFIED_ON_RIGHT);
 //        MATERIAL_FLAGS.put(Material.STAINED_GLASS, 0);
+        MATERIAL_FLAGS.put(Material.ACACIA_TRAPDOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.BIRCH_TRAPDOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.DARK_OAK_TRAPDOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.JUNGLE_TRAPDOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.OAK_TRAPDOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.SPRUCE_TRAPDOOR, MODIFIED_ON_RIGHT);
         MATERIAL_FLAGS.put(Material.INFESTED_STONE, 0);
         MATERIAL_FLAGS.put(Material.INFESTED_STONE_BRICKS, 0);
         MATERIAL_FLAGS.put(Material.INFESTED_MOSSY_STONE_BRICKS, 0);
@@ -225,6 +227,11 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.IRON_TRAPDOOR, 0);
         MATERIAL_FLAGS.put(Material.RED_SANDSTONE, 0);
         MATERIAL_FLAGS.put(Material.RED_SANDSTONE_STAIRS, 0);
+        MATERIAL_FLAGS.put(Material.SPRUCE_DOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.BIRCH_DOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.JUNGLE_DOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.ACACIA_DOOR, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.DARK_OAK_DOOR, MODIFIED_ON_RIGHT);
 
         MATERIAL_FLAGS.put(Material.DIRT_PATH, 0);
         MATERIAL_FLAGS.put(Material.CHORUS_PLANT, 0);
@@ -240,7 +247,7 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.PURPUR_SLAB, 0);
         MATERIAL_FLAGS.put(Material.STRUCTURE_BLOCK, MODIFIED_ON_LEFT | MODIFIED_ON_RIGHT);
         MATERIAL_FLAGS.put(Material.REPEATING_COMMAND_BLOCK, MODIFIED_ON_RIGHT);
-        MATERIAL_FLAGS.put(Material.CHAIN_COMMAND_BLOCK, MODIFIED_ON_RIGHT);
+        MATERIAL_FLAGS.put(Material.CHAIN_COMMAND_BLOCK , MODIFIED_ON_RIGHT);
 
         MATERIAL_FLAGS.put(Material.MAGMA_BLOCK, 0);
         MATERIAL_FLAGS.put(Material.NETHER_WART_BLOCK, 0);
@@ -634,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.TURTLE_SCUTE, 0);
+        MATERIAL_FLAGS.put(Material.SCUTE, 0);
         MATERIAL_FLAGS.put(Material.SPLASH_POTION, 0);
         MATERIAL_FLAGS.put(Material.TURTLE_HELMET, 0);
         MATERIAL_FLAGS.put(Material.TRIDENT, 0);
@@ -670,6 +677,7 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.CRIMSON_FUNGUS, 0);
         MATERIAL_FLAGS.put(Material.CRIMSON_NYLIUM, 0);
         MATERIAL_FLAGS.put(Material.CRIMSON_ROOTS, 0);
+        MATERIAL_FLAGS.put(Material.CRIMSON_TRAPDOOR, MODIFIED_ON_RIGHT);
         MATERIAL_FLAGS.put(Material.CRYING_OBSIDIAN, 0);
         MATERIAL_FLAGS.put(Material.GILDED_BLACKSTONE, 0);
         MATERIAL_FLAGS.put(Material.LODESTONE, 0);
@@ -710,6 +718,7 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.WARPED_FUNGUS_ON_A_STICK, 0);
         MATERIAL_FLAGS.put(Material.WARPED_NYLIUM, 0);
         MATERIAL_FLAGS.put(Material.WARPED_ROOTS, 0);
+        MATERIAL_FLAGS.put(Material.WARPED_TRAPDOOR, MODIFIED_ON_RIGHT);
         MATERIAL_FLAGS.put(Material.WARPED_WART_BLOCK, 0);
         MATERIAL_FLAGS.put(Material.WEEPING_VINES, 0);
         MATERIAL_FLAGS.put(Material.WEEPING_VINES_PLANT, 0);
@@ -811,70 +820,35 @@ public final class Materials {
         MATERIAL_FLAGS.put(Material.ECHO_SHARD, 0);
         MATERIAL_FLAGS.put(Material.REINFORCED_DEEPSLATE, 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);
+        // 1.20
+        try {
+            SIGNS_TAG = Tag.ALL_SIGNS;
 
-        MATERIAL_FLAGS.put(Material.ARMADILLO_SCUTE, 0);
-        MATERIAL_FLAGS.put(Material.WOLF_ARMOR, 0);
-
-        // 1.21
-        MATERIAL_FLAGS.put(Material.CHISELED_TUFF, 0);
-        MATERIAL_FLAGS.put(Material.POLISHED_TUFF, 0);
-        MATERIAL_FLAGS.put(Material.TUFF_BRICKS, 0);
-        MATERIAL_FLAGS.put(Material.CHISELED_TUFF_BRICKS, 0);
-        MATERIAL_FLAGS.put(Material.HEAVY_CORE, 0);
-        MATERIAL_FLAGS.put(Material.CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.EXPOSED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.WEATHERED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.OXIDIZED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_EXPOSED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_WEATHERED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_OXIDIZED_CHISELED_COPPER, 0);
-        MATERIAL_FLAGS.put(Material.CRAFTER, 0);
-        MATERIAL_FLAGS.put(Material.FLOW_BANNER_PATTERN, 0);
-        MATERIAL_FLAGS.put(Material.GUSTER_BANNER_PATTERN, 0);
-        MATERIAL_FLAGS.put(Material.COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.WEATHERED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.EXPOSED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.OXIDIZED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_WEATHERED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_EXPOSED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_OXIDIZED_COPPER_GRATE, 0);
-        MATERIAL_FLAGS.put(Material.COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.WEATHERED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.EXPOSED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.OXIDIZED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_WEATHERED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_EXPOSED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.WAXED_OXIDIZED_COPPER_BULB, 0);
-        MATERIAL_FLAGS.put(Material.TRIAL_SPAWNER, 0);
-        MATERIAL_FLAGS.put(Material.TRIAL_KEY, 0);
-        MATERIAL_FLAGS.put(Material.OMINOUS_TRIAL_KEY, 0);
-        MATERIAL_FLAGS.put(Material.VAULT, MODIFIED_ON_RIGHT);
-        MATERIAL_FLAGS.put(Material.OMINOUS_BOTTLE, 0);
-        MATERIAL_FLAGS.put(Material.BREEZE_ROD, 0);
-        MATERIAL_FLAGS.put(Material.WIND_CHARGE, 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) {
+        }
 
+        // Generated via tag
+        putMaterialTag(Tag.WOODEN_DOORS, MODIFIED_ON_RIGHT);
+        putMaterialTag(Tag.WOODEN_TRAPDOORS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.SHULKER_BOXES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.ITEMS_BOATS, 0);
         putMaterialTag(Tag.BANNERS, 0);
@@ -890,9 +864,10 @@ public final class Materials {
         putMaterialTag(Tag.BUTTONS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.FLOWER_POTS, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.WALLS, 0);
-        putMaterialTag(Tag.ALL_SIGNS, 0);
+        putMaterialTag(SIGNS_TAG, 0);
         putMaterialTag(Tag.SMALL_FLOWERS, 0);
         putMaterialTag(Tag.BEDS, MODIFIED_ON_RIGHT);
+        putMaterialTag(Tag.ITEMS_MUSIC_DISCS, 0);
         putMaterialTag(Tag.ITEMS_BANNERS, 0);
         putMaterialTag(Tag.FENCE_GATES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.FENCES, 0);
@@ -908,10 +883,12 @@ public final class Materials {
         putMaterialTag(Tag.CANDLES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.CANDLE_CAKES, MODIFIED_ON_RIGHT);
         putMaterialTag(Tag.CAULDRONS, MODIFIED_ON_RIGHT);
-
-        // 1.20
-        putMaterialTag(Tag.ITEMS_TRIM_TEMPLATES, 0);
-        putMaterialTag(Tag.ITEMS_DECORATED_POT_SHERDS, 0);
+        try {
+            // 1.20
+            putMaterialTag(Tag.ITEMS_TRIM_TEMPLATES, 0);
+            putMaterialTag(Tag.ITEMS_DECORATED_POT_SHERDS, 0);
+        } catch (NoSuchFieldError ignored) {
+        }
 
         Stream.concat(Stream.concat(
                 Tag.CORAL_BLOCKS.getValues().stream(),
@@ -931,25 +908,22 @@ public final class Materials {
             if (isSpawnEgg(material)) {
                 MATERIAL_FLAGS.put(material, 0);
             }
-            if (material.name().startsWith("MUSIC_DISC_")) {
-                MATERIAL_FLAGS.put(material, 0);
-            }
             if (!MATERIAL_FLAGS.containsKey(material)) {
                 logger.fine("Missing material definition for " + (material.isBlock() ? "block " : "item ") + material.name());
             }
         }
 
 //        DAMAGE_EFFECTS.add(PotionEffectType.SPEED);
-        DAMAGE_EFFECTS.add(PotionEffectType.SLOWNESS);
-//        DAMAGE_EFFECTS.add(PotionEffectType.HASTE);
-        DAMAGE_EFFECTS.add(PotionEffectType.MINING_FATIGUE);
-//        DAMAGE_EFFECTS.add(PotionEffectType.STRENGTH);
-//        DAMAGE_EFFECTS.add(PotionEffectType.INSTANT_HEALTH);
-        DAMAGE_EFFECTS.add(PotionEffectType.INSTANT_DAMAGE);
-//        DAMAGE_EFFECTS.add(PotionEffectType.JUMP_BOOST);
-        DAMAGE_EFFECTS.add(PotionEffectType.NAUSEA);
+        DAMAGE_EFFECTS.add(PotionEffectType.SLOW);
+//        DAMAGE_EFFECTS.add(PotionEffectType.FAST_DIGGING);
+        DAMAGE_EFFECTS.add(PotionEffectType.SLOW_DIGGING);
+//        DAMAGE_EFFECTS.add(PotionEffectType.INCREASE_DAMAGE);
+//        DAMAGE_EFFECTS.add(PotionEffectType.HEAL);
+        DAMAGE_EFFECTS.add(PotionEffectType.HARM);
+//        DAMAGE_EFFECTS.add(PotionEffectType.JUMP);
+        DAMAGE_EFFECTS.add(PotionEffectType.CONFUSION);
 //        DAMAGE_EFFECTS.add(PotionEffectType.REGENERATION);
-//        DAMAGE_EFFECTS.add(PotionEffectType.RESISTANCE);
+//        DAMAGE_EFFECTS.add(PotionEffectType.DAMAGE_RESISTANCE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.FIRE_RESISTANCE);
 //        DAMAGE_EFFECTS.add(PotionEffectType.WATER_BREATHING);
 //        DAMAGE_EFFECTS.add(PotionEffectType.INVISIBILITY);
@@ -972,11 +946,6 @@ public final class Materials {
         DAMAGE_EFFECTS.add(PotionEffectType.BAD_OMEN);
 //        DAMAGE_EFFECTS.add(PotionEffectType.HERO_OF_THE_VILLAGE);
         DAMAGE_EFFECTS.add(PotionEffectType.DARKNESS);
-        DAMAGE_EFFECTS.add(PotionEffectType.TRIAL_OMEN);
-        DAMAGE_EFFECTS.add(PotionEffectType.WIND_CHARGED);
-        DAMAGE_EFFECTS.add(PotionEffectType.WEAVING);
-        DAMAGE_EFFECTS.add(PotionEffectType.OOZING);
-        DAMAGE_EFFECTS.add(PotionEffectType.INFESTED);
     }
 
     private Materials() {
@@ -1018,11 +987,13 @@ public final class Materials {
      * @return the block material
      */
     public static Material getBucketBlockMaterial(Material type) {
-        return switch (type) {
-            case LAVA_BUCKET -> Material.LAVA;
-            case WATER_BUCKET -> Material.WATER;
-            default -> Material.WATER;
-        };
+        switch (type) {
+            case LAVA_BUCKET:
+                return Material.LAVA;
+            case WATER_BUCKET:
+            default:
+                return Material.WATER;
+        }
     }
 
     /**
@@ -1163,7 +1134,6 @@ public final class Materials {
                 || material == Material.BLAST_FURNACE
                 || material == Material.SMOKER
                 || material == Material.CHISELED_BOOKSHELF
-                || material == Material.CRAFTER
                 || Tag.ITEMS_CHEST_BOATS.isTagged(material)
                 || Tag.SHULKER_BOXES.isTagged(material);
     }
@@ -1175,13 +1145,11 @@ 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;
             case BEE_SPAWN_EGG -> EntityType.BEE;
             case BLAZE_SPAWN_EGG -> EntityType.BLAZE;
-            case BOGGED_SPAWN_EGG -> EntityType.BOGGED;
-            case BREEZE_SPAWN_EGG -> EntityType.BREEZE;
             case CAT_SPAWN_EGG -> EntityType.CAT;
             case CAMEL_SPAWN_EGG -> EntityType.CAMEL;
             case CAVE_SPIDER_SPAWN_EGG -> EntityType.CAVE_SPIDER;
@@ -1209,7 +1177,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.MOOSHROOM;
+            case MOOSHROOM_SPAWN_EGG -> EntityType.MUSHROOM_COW;
             case MULE_SPAWN_EGG -> EntityType.MULE;
             case OCELOT_SPAWN_EGG -> EntityType.OCELOT;
             case PANDA_SPAWN_EGG -> EntityType.PANDA;
@@ -1230,8 +1198,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.SNOW_GOLEM;
-            case SPIDER_SPAWN_EGG -> EntityType.SPIDER;
+            case SNOW_GOLEM_SPAWN_EGG -> EntityType.SNOWMAN;
             case SQUID_SPAWN_EGG -> EntityType.SQUID;
             case STRAY_SPAWN_EGG -> EntityType.STRAY;
             case STRIDER_SPAWN_EGG -> EntityType.STRIDER;
@@ -1315,15 +1282,15 @@ public final class Materials {
      */
     public static boolean isUseFlagApplicable(Material material) {
         if (Tag.BUTTONS.isTagged(material)
-                || Tag.DOORS.isTagged(material)
-                || Tag.TRAPDOORS.isTagged(material)
+                || Tag.WOODEN_DOORS.isTagged(material)
+                || Tag.WOODEN_TRAPDOORS.isTagged(material)
                 || Tag.FENCE_GATES.isTagged(material)
                 || Tag.PRESSURE_PLATES.isTagged(material)) {
             return true;
         }
         return switch (material) {
             case LEVER, LECTERN, ENCHANTING_TABLE, BELL, LOOM,
-                    CARTOGRAPHY_TABLE, STONECUTTER, GRINDSTONE, VAULT -> true;
+                    CARTOGRAPHY_TABLE, STONECUTTER, GRINDSTONE -> true;
             default -> false;
         };
     }
@@ -1375,8 +1342,7 @@ public final class Materials {
             || type == Material.DRAGON_EGG
             || Tag.FLOWER_POTS.isTagged(type)
             || Tag.CANDLES.isTagged(type)
-            || Tag.CANDLE_CAKES.isTagged(type)
-            || Tag.ALL_SIGNS.isTagged(type);
+            || Tag.CANDLE_CAKES.isTagged(type);
     }
 
     /**
@@ -1406,13 +1372,15 @@ public final class Materials {
      * @return true if equippable armor
      */
     public static boolean isArmor(Material type) {
-        if (Tag.ITEMS_HEAD_ARMOR.isTagged(type) || Tag.ITEMS_CHEST_ARMOR.isTagged(type) ||
-                Tag.ITEMS_LEG_ARMOR.isTagged(type) || Tag.ITEMS_FOOT_ARMOR.isTagged(type) ||
-                Tag.ITEMS_SKULLS.isTagged(type)) {
-            return true;
-        }
         return switch (type) {
-            case CARVED_PUMPKIN, ELYTRA -> true;
+            case LEATHER_HELMET, LEATHER_CHESTPLATE, LEATHER_LEGGINGS, LEATHER_BOOTS,
+                    CHAINMAIL_HELMET, CHAINMAIL_CHESTPLATE, CHAINMAIL_LEGGINGS, CHAINMAIL_BOOTS,
+                    IRON_HELMET, IRON_CHESTPLATE, IRON_LEGGINGS, IRON_BOOTS,
+                    DIAMOND_HELMET, DIAMOND_CHESTPLATE, DIAMOND_LEGGINGS, DIAMOND_BOOTS,
+                    GOLDEN_HELMET, GOLDEN_CHESTPLATE, GOLDEN_LEGGINGS, GOLDEN_BOOTS,
+                    NETHERITE_HELMET, NETHERITE_CHESTPLATE, NETHERITE_LEGGINGS, NETHERITE_BOOTS,
+                    TURTLE_HELMET, ELYTRA ->
+                    true;
             default -> false;
         };
     }
@@ -1487,17 +1455,14 @@ public final class Materials {
             case YELLOW_DYE:
             case GLOW_INK_SAC:
             case INK_SAC:
-                return Tag.ALL_SIGNS.isTagged(targetMaterial);
+                return SIGNS_TAG.isTagged(targetMaterial);
             case HONEYCOMB:
-                return isUnwaxedCopper(targetMaterial) || Tag.ALL_SIGNS.isTagged(targetMaterial);
+                return isUnwaxedCopper(targetMaterial) || SIGNS_TAG.isTagged(targetMaterial);
             case BRUSH:
                 return switch (targetMaterial) {
                     case SUSPICIOUS_GRAVEL, SUSPICIOUS_SAND -> true;
                     default -> false;
                 };
-            case WRITTEN_BOOK:
-            case WRITABLE_BOOK:
-                return targetMaterial == Material.LECTERN;
             default:
                 return false;
         }
@@ -1506,18 +1471,27 @@ public final class Materials {
     public static boolean isFire(Material type) {
         return type == Material.FIRE || type == Material.SOUL_FIRE;
     }
-
+    
     public static boolean isWaxedCopper(Material type) {
-        // copied from the MaterialTags class in Paper
-        return type.name().startsWith("WAXED_") && type.name().contains("COPPER");
-    }
-
-    public static boolean isUnwaxedCopper(Material type) {
-        // copied from the MaterialTags class in Paper
         return switch (type) {
-            case COPPER_BLOCK, CHISELED_COPPER, COPPER_DOOR, COPPER_TRAPDOOR, COPPER_GRATE, COPPER_BULB -> true;
-            default -> type.name().startsWith("EXPOSED_") || type.name().startsWith("WEATHERED_") ||
-                    type.name().startsWith("OXIDIZED_") || type.name().startsWith("CUT_COPPER");
+            case WAXED_COPPER_BLOCK, WAXED_EXPOSED_COPPER, WAXED_WEATHERED_COPPER, WAXED_OXIDIZED_COPPER,
+                    WAXED_CUT_COPPER, WAXED_EXPOSED_CUT_COPPER, WAXED_WEATHERED_CUT_COPPER,
+                    WAXED_OXIDIZED_CUT_COPPER, WAXED_CUT_COPPER_STAIRS, WAXED_EXPOSED_CUT_COPPER_STAIRS,
+                    WAXED_WEATHERED_CUT_COPPER_STAIRS, WAXED_OXIDIZED_CUT_COPPER_STAIRS, WAXED_CUT_COPPER_SLAB,
+                    WAXED_EXPOSED_CUT_COPPER_SLAB, WAXED_WEATHERED_CUT_COPPER_SLAB, WAXED_OXIDIZED_CUT_COPPER_SLAB ->
+                    true;
+            default -> false;
+        };
+    }
+    
+    public static boolean isUnwaxedCopper(Material type) {
+        return switch (type) {
+            case COPPER_BLOCK, EXPOSED_COPPER, WEATHERED_COPPER, OXIDIZED_COPPER, CUT_COPPER,
+                    EXPOSED_CUT_COPPER, WEATHERED_CUT_COPPER, OXIDIZED_CUT_COPPER, CUT_COPPER_STAIRS,
+                    EXPOSED_CUT_COPPER_STAIRS, WEATHERED_CUT_COPPER_STAIRS, OXIDIZED_CUT_COPPER_STAIRS,
+                    CUT_COPPER_SLAB, EXPOSED_CUT_COPPER_SLAB, WEATHERED_CUT_COPPER_SLAB, OXIDIZED_CUT_COPPER_SLAB ->
+                    true;
+            default -> false;
         };
     }
 

worldguard-bukkit/src/main/resources/plugin.yml

@@ -3,4 +3,4 @@ main: com.sk89q.worldguard.bukkit.WorldGuardPlugin
 version: "${internalVersion}"
 depend: [WorldEdit]
 softdepend: [CommandBook]
-api-version: "1.21"
+api-version: 1.19

worldguard-core/build.gradle.kts

@@ -1,51 +1,20 @@
-import org.cadixdev.gradle.licenser.LicenseExtension
-
 plugins {
     `java-library`
-    id("buildlogic.core-and-platform")
 }
 
+applyPlatformAndCoreConfiguration()
+
 dependencies {
-    constraints {
-        "implementation"(libs.snakeyaml) {
-            because("Bukkit provides SnakeYaml")
-        }
-    }
-
     "api"(project(":worldguard-libs:core"))
-    "api"(libs.worldedit.core)
-    "implementation"(libs.flyway.core)
-    "implementation"(libs.snakeyaml)
-    "implementation"(libs.guava)
-    "compileOnlyApi"(libs.jsr305)
-    "implementation"(libs.gson)
+    "api"("com.sk89q.worldedit:worldedit-core:${Versions.WORLDEDIT}")
+    "implementation"("org.flywaydb:flyway-core:3.0")
+    "implementation"("org.yaml:snakeyaml:2.0")
+    "implementation"("com.google.guava:guava:${Versions.GUAVA}")
 
-    "compileOnly"(libs.worldedit.libs.ap)
-    "annotationProcessor"(libs.worldedit.libs.ap)
-    // ensure this is on the classpath for the AP
-    "annotationProcessor"(libs.guava)
-
-    "compileOnly"(libs.autoService) {
-        because("Needed to resolve annotations in Piston")
-    }
-
-    "testImplementation"(libs.hamcrest.library)
+    "compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}")
+    "testImplementation"("org.hamcrest:hamcrest-library:2.2")
 }
 
-tasks.compileJava {
+tasks.withType<JavaCompile>().configureEach {
     dependsOn(":worldguard-libs:build")
-    options.compilerArgs.add("-Aarg.name.key.prefix=")
-}
-
-configure<LicenseExtension> {
-    exclude {
-        it.file.startsWith(project.layout.buildDirectory.get().asFile)
-    }
-}
-
-configure<PublishingExtension> {
-    publications.named<MavenPublication>("maven") {
-        artifactId = the<BasePluginExtension>().archivesName.get()
-        from(components["java"])
-    }
-}
+}

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.x());
-            stmt.setInt(5, pos.y());
-            stmt.setInt(6, pos.z());
+            stmt.setInt(4, pos.getBlockX());
+            stmt.setInt(5, pos.getBlockY());
+            stmt.setInt(6, pos.getBlockZ());
             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.x() + "," + pos.y() + "," + pos.z();
+        return "@" + pos.getBlockX() + "," + pos.getBlockY() + "," + pos.getBlockZ();
     }
 
     private void logEvent(BlacklistEvent event, String text, Target target, BlockVector3 pos, String comment) {

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

@@ -70,7 +70,7 @@ public class GeneralCommands {
 
                     // Keep track of this
                     included = true;
-                } else if (!args.hasFlag('s')) {
+                } else {
                     player.print("God enabled by " + sender.getDisplayName() + ".");
 
                 }
@@ -79,7 +79,7 @@ public class GeneralCommands {
         
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
-        if (!included) {
+        if (!included && args.hasFlag('s')) {
             sender.print("Players now have god mode.");
         }
     }
@@ -113,7 +113,7 @@ public class GeneralCommands {
 
                     // Keep track of this
                     included = true;
-                } else if (!args.hasFlag('s')) {
+                } else {
                     player.print("God disabled by " + sender.getDisplayName() + ".");
 
                 }
@@ -122,7 +122,7 @@ public class GeneralCommands {
         
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
-        if (!included) {
+        if (!included && args.hasFlag('s')) {
             sender.print("Players no longer have god mode.");
         }
     }
@@ -158,7 +158,7 @@ public class GeneralCommands {
                 
                 // Keep track of this
                 included = true;
-            } else if (!args.hasFlag('s')) {
+            } else {
                 player.print("Healed by " + sender.getDisplayName() + ".");
                 
             }
@@ -166,7 +166,7 @@ public class GeneralCommands {
         
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
-        if (!included) {
+        if (!included && args.hasFlag('s')) {
             sender.print("Players healed.");
         }
     }
@@ -199,7 +199,7 @@ public class GeneralCommands {
                 
                 // Keep track of this
                 included = true;
-            } else if (!args.hasFlag('s')) {
+            } else {
                 player.print("Slain by " + sender.getDisplayName() + ".");
                 
             }
@@ -207,7 +207,7 @@ public class GeneralCommands {
         
         // The player didn't receive any items, then we need to send the
         // user a message so s/he know that something is indeed working
-        if (!included) {
+        if (!included && args.hasFlag('s')) {
             sender.print("Players slain.");
         }
     }

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.id();
+        String display = currVal == null ? regName : currVal.getId();
         appendValueText(builder, flag, display, null);
     }
 

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

@@ -305,8 +305,8 @@ class RegionCommandsBase {
         // Detect the type of region from WorldEdit
         if (selection instanceof Polygonal2DRegion) {
             Polygonal2DRegion polySel = (Polygonal2DRegion) selection;
-            int minY = polySel.getMinimumPoint().y();
-            int maxY = polySel.getMaximumPoint().y();
+            int minY = polySel.getMinimumPoint().getBlockY();
+            int maxY = polySel.getMaximumPoint().getBlockY();
             return new ProtectedPolygonalRegion(id, polySel.getPoints(), minY, maxY);
         } else if (selection instanceof CuboidRegion) {
             BlockVector3 min = selection.getMinimumPoint();
@@ -345,7 +345,7 @@ class RegionCommandsBase {
         if (region instanceof GlobalProtectedRegion) {
             return;
         }
-        int height = region.getMaximumPoint().y() - region.getMinimumPoint().y();
+        int height = region.getMaximumPoint().getBlockY() - region.getMinimumPoint().getBlockY();
         if (height <= 2) {
             sender.printDebug("(Warning: The height of the region was " + (height + 1) + " block(s).)");
         }

worldguard-core/src/main/java/com/sk89q/worldguard/config/WorldConfiguration.java

@@ -101,7 +101,6 @@ public abstract class WorldConfiguration {
     public boolean blockEnderDragonPortalCreation;
     public boolean blockFireballExplosions;
     public boolean blockFireballBlockDamage;
-    public boolean blockWindChargeExplosions;
     public boolean blockOtherExplosions;
     public boolean blockEntityPaintingDestroy;
     public boolean blockEntityItemFrameDestroy;
@@ -167,7 +166,6 @@ public abstract class WorldConfiguration {
     public boolean disableEndermanGriefing;
     public boolean disableSnowmanTrails;
     public boolean disableSoilDehydration;
-    public boolean disableSoilMoistureChange;
     public boolean disableCoralBlockFade;
     public boolean disableCopperBlockFade;
     public Set<String> allowedSnowFallOver;

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

@@ -36,12 +36,12 @@ import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.HashSet;
 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;
 
@@ -53,7 +53,7 @@ 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 Set<CustomDomain> customDomains = new HashSet<>();
     private boolean customDomainsChanged = false;
 
     /**
@@ -70,7 +70,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
     public DefaultDomain(DefaultDomain existing) {
         setPlayerDomain(existing.getPlayerDomain());
         setGroupDomain(existing.getGroupDomain());
-        setCustomDomains(existing.customDomains);
+        setCustomDomains(existing.getCustomDomains());
     }
 
     /**
@@ -118,8 +118,9 @@ public class DefaultDomain implements Domain, ChangeTracked {
      */
     public void addCustomDomain(CustomDomain customDomain) {
         checkNotNull(customDomain);
-        this.customDomains.put(customDomain.getName(), customDomain);
-        this.customDomainsChanged = true;
+        removeCustomDomain(customDomain.getName());
+        this.customDomains.add(customDomain);
+        customDomainsChanged = true;
     }
 
     /**
@@ -129,8 +130,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
      */
     public void removeCustomDomain(String name) {
         checkNotNull(name);
-        if (this.customDomains.remove(name) != null) {
-            this.customDomainsChanged = true;
+        if (this.customDomains.removeIf(d -> d.getName().equalsIgnoreCase(name))) {
+            customDomainsChanged = true;
         }
     }
 
@@ -141,8 +142,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
      */
     public void removeCustomDomain(CustomDomain customDomain) {
         checkNotNull(customDomain);
-        if (this.customDomains.remove(customDomain.getName()) != null) {
-            this.customDomainsChanged = true;
+        if (this.customDomains.remove(customDomain)) {
+            customDomainsChanged = true;
         }
     }
 
@@ -151,11 +152,10 @@ public class DefaultDomain implements Domain, ChangeTracked {
      *
      * @param customDomains the domains
      */
-    public void setCustomDomains(Map<String, CustomDomain> customDomains) {
+    public void setCustomDomains(Collection<CustomDomain> customDomains) {
         checkNotNull(customDomains);
-        this.customDomains.clear();
-        this.customDomains.putAll(customDomains);
-        this.customDomainsChanged = true;
+        this.customDomains = new HashSet<>(customDomains);
+        customDomainsChanged = true;
     }
 
     /**
@@ -163,18 +163,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
      *
      * @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);
+    public Set<CustomDomain> getCustomDomains() {
+        return Collections.unmodifiableSet(this.customDomains);
     }
 
     /**
@@ -321,12 +311,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     @Override
     public boolean contains(LocalPlayer player) {
-        return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.values().stream().anyMatch(d -> d.contains(player));
+        return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.stream().anyMatch(d -> d.contains(player));
     }
 
     @Override
     public boolean contains(UUID uniqueId) {
-        return playerDomain.contains(uniqueId) || customDomains.values().stream().anyMatch(d -> d.contains(uniqueId));
+        return playerDomain.contains(uniqueId) || customDomains.stream().anyMatch(d -> d.contains(uniqueId));
     }
 
     @Override
@@ -394,7 +384,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     public String toCustomDomainsString() {
         List<String> output = new ArrayList<>();
-        for (CustomDomain customDomain : customDomains.values()) {
+        for (CustomDomain customDomain : customDomains) {
             output.add(customDomain.getName() + ":" + customDomain.toString());
         }
         output.sort(String.CASE_INSENSITIVE_ORDER);
@@ -523,7 +513,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     private Component toCustomDomainsComponent() {
         final TextComponent.Builder builder = TextComponent.builder("");
-        for (Iterator<CustomDomain> it = customDomains.values().iterator(); it.hasNext(); ) {
+        for (Iterator<CustomDomain> it = customDomains.iterator(); it.hasNext(); ) {
             CustomDomain domain = it.next();
             builder.append(TextComponent.of(domain.getName() + ":", TextColor.LIGHT_PURPLE))
                     .append(TextComponent.of(domain.toString(), TextColor.GOLD));
@@ -538,7 +528,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
     @Override
     public boolean isDirty() {
         return playerDomain.isDirty() || groupDomain.isDirty() ||
-                customDomainsChanged ||  customDomains.values().stream().anyMatch(ChangeTracked::isDirty);
+                customDomainsChanged ||  customDomains.stream().anyMatch(ChangeTracked::isDirty);
     }
 
     @Override
@@ -546,7 +536,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
         playerDomain.setDirty(dirty);
         groupDomain.setDirty(dirty);
         customDomainsChanged = dirty;
-        customDomains.values().forEach(d -> d.setDirty(dirty));
+        customDomains.forEach(d -> d.setDirty(dirty));
     }
 
     @Override

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

@@ -83,7 +83,7 @@ public interface DomainRegistry extends Iterable<DomainFactory<?>> {
      * @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);
+    List<CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown);
 
     /**
      * Get the number of registered domains.

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

@@ -25,8 +25,9 @@ import com.google.common.collect.Maps;
 import com.sk89q.worldguard.domains.CustomDomain;
 
 import javax.annotation.Nullable;
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 import java.util.logging.Level;
@@ -138,20 +139,20 @@ public class SimpleDomainRegistry implements DomainRegistry {
         return null;
     }
 
-    public Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) {
+    public List<CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) {
         checkNotNull(rawValues, "rawValues");
 
-        Map<String, CustomDomain> domains = new HashMap<>();
+        List<CustomDomain> domainList = new ArrayList<>();
 
         for (Map.Entry<String, Object> entry : rawValues.entrySet()) {
             try {
                 CustomDomain domain = getOrCreate(entry.getKey(), entry.getValue(), createUnknown);
-                domains.put(domain.getName(), domain);
+                domainList.add(domain);
             } catch (Throwable e) {
                 log.log(Level.WARNING, "Failed to unmarshal domain for " + entry.getKey(), e);
             }
         }
-        return domains;
+        return domainList;
     }
 
     @Override

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

@@ -57,6 +57,6 @@ public class EntityTypeFlag extends Flag<EntityType> {
 
     @Override
     public Object marshal(EntityType o) {
-        return o.id();
+        return o.getId();
     }
 }

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

@@ -74,7 +74,6 @@ public final class Flags {
     public static final StateFlag FIREWORK_DAMAGE = register(new StateFlag("firework-damage", false));
     public static final StateFlag USE_ANVIL = register(new StateFlag("use-anvil", false));
     public static final StateFlag USE_DRIPLEAF = register(new StateFlag("use-dripleaf", false));
-    public static final StateFlag WIND_CHARGE_BURST = register(new StateFlag("wind-charge-burst", false));
 
     // These flags are similar to the ones above (used in tandem with BUILD),
     // but their defaults are set to TRUE because it is more user friendly.
@@ -94,7 +93,6 @@ public final class Flags {
     public static final StateFlag ENDERDRAGON_BLOCK_DAMAGE = register(new StateFlag("enderdragon-block-damage", true));
     public static final StateFlag GHAST_FIREBALL = register(new StateFlag("ghast-fireball", true));
     public static final StateFlag OTHER_EXPLOSION = register(new StateFlag("other-explosion", true));
-    public static final StateFlag BREEZE_WIND_CHARGE = register(new StateFlag("breeze-charge-explosion", true));
     public static final StateFlag WITHER_DAMAGE = register(new StateFlag("wither-damage", true));
     public static final StateFlag ENDER_BUILD = register(new StateFlag("enderman-grief", true));
     public static final StateFlag SNOWMAN_TRAILS = register(new StateFlag("snowman-trails", true));
@@ -130,7 +128,6 @@ public final class Flags {
     public static final StateFlag COPPER_FADE = register(new StateFlag("copper-fade", true));
     public static final StateFlag WATER_FLOW = register(new StateFlag("water-flow", true));
     public static final StateFlag LAVA_FLOW = register(new StateFlag("lava-flow", true));
-    public static final StateFlag MOISTURE_CHANGE = register(new StateFlag("moisture-change", true));
 
     public static final RegistryFlag<WeatherType> WEATHER_LOCK = register(new RegistryFlag<>("weather-lock", WeatherType.REGISTRY));
     public static final StringFlag TIME_LOCK = register(new StringFlag("time-lock"));

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

@@ -57,6 +57,6 @@ public class GameModeTypeFlag extends Flag<GameMode> {
 
     @Override
     public Object marshal(GameMode o) {
-        return o.id();
+        return o.getId();
     }
 }

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

@@ -137,9 +137,9 @@ public class LocationFlag extends Flag<Location> {
                 return null;
             }
         }
-        vec.put("x", position.x());
-        vec.put("y", position.y());
-        vec.put("z", position.z());
+        vec.put("x", position.getX());
+        vec.put("y", position.getY());
+        vec.put("z", position.getZ());
         vec.put("yaw", o.getYaw());
         vec.put("pitch", o.getPitch());
         return vec;

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

@@ -61,6 +61,6 @@ public class RegistryFlag<T extends Keyed> extends Flag<T> {
 
     @Override
     public Object marshal(T o) {
-        return o.id();
+        return o.getId();
     }
 }

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

@@ -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.x());
-        vec.put("y", o.y());
-        vec.put("z", o.z());
+        vec.put("x", o.getX());
+        vec.put("y", o.getY());
+        vec.put("z", o.getZ());
         return vec;
     }
 

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

@@ -57,6 +57,6 @@ public class WeatherTypeFlag extends Flag<WeatherType> {
 
     @Override
     public Object marshal(WeatherType o) {
-        return o.id();
+        return o.getId();
     }
 }

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.x(), position.z());
+            state = states.get(position.getBlockX(), position.getBlockZ());
             if (state == null && create) {
                 state = new ChunkState(position);
-                states.put(position.x(), position.z(), state);
+                states.put(position.getBlockX(), position.getBlockZ(), 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.x(), position.z(), new ChunkState(position));
+                states.put(position.getBlockX(), position.getBlockZ(), 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.x(), chunkPosition.z());
+            states.remove(chunkPosition.getBlockX(), chunkPosition.getBlockZ());
             ChunkState state = lastState;
-            if (state != null && state.getPosition().x() == chunkPosition.x() && state.getPosition().z() == chunkPosition.z()) {
+            if (state != null && state.getPosition().getBlockX() == chunkPosition.getBlockX() && state.getPosition().getBlockZ() == chunkPosition.getBlockZ()) {
                 lastState = null;
             }
         }
@@ -238,10 +238,10 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
         checkNotNull(consumer);
 
         ChunkState state = lastState;
-        int chunkX = position.x() >> 4;
-        int chunkZ = position.z() >> 4;
+        int chunkX = position.getBlockX() >> 4;
+        int chunkZ = position.getBlockZ() >> 4;
 
-        if (state == null || state.getPosition().x() != chunkX || state.getPosition().z() != chunkZ) {
+        if (state == null || state.getPosition().getBlockX() != chunkX || state.getPosition().getBlockZ() != 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.x(), position.x(), position.y(), position.y(), position.z(), position.z());
+        MBR pointMBR = new SimpleMBR(position.getX(), position.getX(), position.getY(), position.getY(), position.getZ(), position.getZ());
 
         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.x(), max.x(), min.y(), max.y(), min.z(), max.z());
+        MBR pointMBR = new SimpleMBR(min.getX(), max.getX(), min.getY(), max.getY(), min.getZ(), max.getZ());
 
         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().y() <= 0
-                    && region.getMaximumPoint().y() >= 255) {
+            if (region.getMinimumPoint().getBlockY() <= 0
+                    && region.getMaximumPoint().getBlockY() >= 255) {
                 expand(region, min, max);
                 changed++;
             }

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

@@ -195,64 +195,66 @@ public class YamlRegionFile implements RegionDatabase {
     public void saveAll(Set<ProtectedRegion> regions) throws StorageException {
         checkNotNull(regions);
 
-        File tempFile = new File(file.getParentFile(), file.getName() + ".tmp");
-        YAMLProcessor config = createYamlProcessor(tempFile);
+        synchronized (YamlRegionFile.class) {
+            File tempFile = new File(file.getParentFile(), file.getName() + ".tmp");
+            YAMLProcessor config = createYamlProcessor(tempFile);
 
-        config.clear();
+            config.clear();
 
-        YAMLNode regionsNode = config.addNode("regions");
-        Map<String, Object> map = regionsNode.getMap();
+            YAMLNode regionsNode = config.addNode("regions");
+            Map<String, Object> map = regionsNode.getMap();
 
-        for (ProtectedRegion region : regions) {
-            Map<String, Object> nodeMap = new HashMap<>();
-            map.put(region.getId(), nodeMap);
-            YAMLNode node = new YAMLNode(nodeMap, false);
+            for (ProtectedRegion region : regions) {
+                Map<String, Object> nodeMap = new HashMap<>();
+                map.put(region.getId(), nodeMap);
+                YAMLNode node = new YAMLNode(nodeMap, false);
 
-            if (region instanceof ProtectedCuboidRegion) {
-                ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
-                node.setProperty("type", "cuboid");
-                node.setProperty("min", cuboid.getMinimumPoint());
-                node.setProperty("max", cuboid.getMaximumPoint());
-            } else if (region instanceof ProtectedPolygonalRegion) {
-                ProtectedPolygonalRegion poly = (ProtectedPolygonalRegion) region;
-                node.setProperty("type", "poly2d");
-                node.setProperty("min-y", poly.getMinimumPoint().y());
-                node.setProperty("max-y", poly.getMaximumPoint().y());
+                if (region instanceof ProtectedCuboidRegion) {
+                    ProtectedCuboidRegion cuboid = (ProtectedCuboidRegion) region;
+                    node.setProperty("type", "cuboid");
+                    node.setProperty("min", cuboid.getMinimumPoint());
+                    node.setProperty("max", cuboid.getMaximumPoint());
+                } 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());
 
-                List<Map<String, Object>> points = new ArrayList<>();
-                for (BlockVector2 point : poly.getPoints()) {
-                    Map<String, Object> data = new HashMap<>();
-                    data.put("x", point.x());
-                    data.put("z", point.z());
-                    points.add(data);
+                    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());
+                        points.add(data);
+                    }
+
+                    node.setProperty("points", points);
+                } else if (region instanceof GlobalProtectedRegion) {
+                    node.setProperty("type", "global");
+                } else {
+                    node.setProperty("type", region.getClass().getCanonicalName());
                 }
 
-                node.setProperty("points", points);
-            } else if (region instanceof GlobalProtectedRegion) {
-                node.setProperty("type", "global");
-            } else {
-                node.setProperty("type", region.getClass().getCanonicalName());
+                node.setProperty("priority", region.getPriority());
+                node.setProperty("flags", getFlagData(region));
+                node.setProperty("owners", getDomainData(region.getOwners()));
+                node.setProperty("members", getDomainData(region.getMembers()));
+
+                ProtectedRegion parent = region.getParent();
+                if (parent != null) {
+                    node.setProperty("parent", parent.getId());
+                }
             }
 
-            node.setProperty("priority", region.getPriority());
-            node.setProperty("flags", getFlagData(region));
-            node.setProperty("owners", getDomainData(region.getOwners()));
-            node.setProperty("members", getDomainData(region.getMembers()));
+            config.setHeader(FILE_HEADER);
+            config.save();
 
-            ProtectedRegion parent = region.getParent();
-            if (parent != null) {
-                node.setProperty("parent", parent.getId());
+            //noinspection ResultOfMethodCallIgnored
+            file.delete();
+            if (!tempFile.renameTo(file)) {
+                throw new StorageException("Failed to rename temporary regions file to " + file.getAbsolutePath());
             }
         }
-
-        config.setHeader(FILE_HEADER);
-        config.save();
-
-        //noinspection ResultOfMethodCallIgnored
-        file.delete();
-        if (!tempFile.renameTo(file)) {
-            throw new StorageException("Failed to rename temporary regions file to " + file.getAbsolutePath());
-        }
     }
 
     @Override
@@ -289,7 +291,7 @@ public class YamlRegionFile implements RegionDatabase {
 
         YAMLNode apiDomains = node.getNode("custom");
         if (apiDomains != null) {
-            Map<String, CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true);
+            List<CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true);
             domain.setCustomDomains(parsedDomains);
         }
 

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.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.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.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().y());
-                    stmt.setInt(3, region.getMinimumPoint().y());
+                    stmt.setInt(2, region.getMaximumPoint().getBlockY());
+                    stmt.setInt(3, region.getMinimumPoint().getBlockY());
                     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.z());
-                    stmt.setInt(3, point.x());
+                    stmt.setInt(2, point.getBlockZ());
+                    stmt.setInt(3, point.getBlockX());
                     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.x(), min.z()));
+        pts.add(BlockVector2.at(min.getBlockX(), min.getBlockZ()));
         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.x();
-        int x2 = max.x();
-        int z1 = min.z();
-        int z2 = max.z();
+        int x1 = min.getBlockX();
+        int x2 = max.getBlockX();
+        int z1 = min.getBlockZ();
+        int z2 = max.getBlockZ();
 
         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.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;
+        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;
     }
 
     @Override
@@ -143,10 +143,10 @@ public class ProtectedCuboidRegion extends ProtectedRegion {
 
     @Override
     Area toArea() {
-        int x = getMinimumPoint().x();
-        int z = getMinimumPoint().z();
-        int width = getMaximumPoint().x() - x + 1;
-        int height = getMaximumPoint().z() - z + 1;
+        int x = getMinimumPoint().getBlockX();
+        int z = getMinimumPoint().getBlockZ();
+        int width = getMaximumPoint().getBlockX() - x + 1;
+        int height = getMaximumPoint().getBlockZ() - 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.x() - min.x() + 1;
-        int yLength = max.y() - min.y() + 1;
-        int zLength = max.z() - min.z() + 1;
+        int xLength = max.getBlockX() - min.getBlockX() + 1;
+        int yLength = max.getBlockY() - min.getBlockY() + 1;
+        int zLength = max.getBlockZ() - min.getBlockZ() + 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.y();
-        this.maxY = max.y();
+        this.minY = min.getBlockY();
+        this.maxY = max.getBlockY();
     }
 
     /**
@@ -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.x(), y, point2D.z()));
+            points.add(BlockVector3.at(point2D.getBlockX(), y, point2D.getBlockZ()));
             y = maxY;
         }
         setMinMaxPoints(points);
@@ -102,15 +102,15 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
     public boolean contains(BlockVector3 position) {
         checkNotNull(position);
 
-        int targetX = position.x(); // Width
-        int targetY = position.y(); // Height
-        int targetZ = position.z(); // Depth
+        int targetX = position.getBlockX(); // Width
+        int targetY = position.getBlockY(); // Height
+        int targetZ = position.getBlockZ(); // Depth
 
         if (targetY < minY || targetY > maxY) {
             return false;
         }
         //Quick and dirty check.
-        if (targetX < min.x() || targetX > max.x() || targetZ < min.z() || targetZ > max.z()) {
+        if (targetX < min.getBlockX() || targetX > max.getBlockX() || targetZ < min.getBlockZ() || targetZ > max.getBlockZ()) {
             return false;
         }
         boolean inside = false;
@@ -122,12 +122,12 @@ public class ProtectedPolygonalRegion extends ProtectedRegion {
         long crossproduct;
         int i;
 
-        xOld = points.get(npoints - 1).x();
-        zOld = points.get(npoints - 1).z();
+        xOld = points.get(npoints - 1).getBlockX();
+        zOld = points.get(npoints - 1).getBlockZ();
 
         for (i = 0; i < npoints; i++) {
-            xNew = points.get(i).x();
-            zNew = points.get(i).z();
+            xNew = points.get(i).getBlockX();
+            zNew = points.get(i).getBlockZ();
             //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.x();
-            yCoords[i] = point.z();
+            xCoords[i] = point.getBlockX();
+            yCoords[i] = point.getBlockZ();
             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).x();
-        int minY = points.get(0).y();
-        int minZ = points.get(0).z();
+        int minX = points.get(0).getBlockX();
+        int minY = points.get(0).getBlockY();
+        int minZ = points.get(0).getBlockZ();
         int maxX = minX;
         int maxY = minY;
         int maxZ = minZ;
 
         for (BlockVector3 v : points) {
-            int x = v.x();
-            int y = v.y();
-            int z = v.z();
+            int x = v.getBlockX();
+            int y = v.getBlockY();
+            int z = v.getBlockZ();
 
             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.x(), min.y(), position.z()));
+        return contains(BlockVector3.at(position.getBlockX(), min.getBlockY(), position.getBlockZ()));
     }
 
     /**
@@ -607,16 +607,16 @@ public abstract class ProtectedRegion implements ChangeTracked, Comparable<Prote
         BlockVector3 rMaxPoint = region.getMaximumPoint();
         BlockVector3 min = getMinimumPoint();
 
-        if (rMaxPoint.x() < min.x()) return false;
-        if (rMaxPoint.y() < min.y()) return false;
-        if (rMaxPoint.z() < min.z()) return false;
+        if (rMaxPoint.getBlockX() < min.getBlockX()) return false;
+        if (rMaxPoint.getBlockY() < min.getBlockY()) return false;
+        if (rMaxPoint.getBlockZ() < min.getBlockZ()) return false;
 
         BlockVector3 rMinPoint = region.getMinimumPoint();
         BlockVector3 max = getMaximumPoint();
 
-        if (rMinPoint.x() > max.x()) return false;
-        if (rMinPoint.y() > max.y()) return false;
-        if (rMinPoint.z() > max.z()) return false;
+        if (rMinPoint.getBlockX() > max.getBlockX()) return false;
+        if (rMinPoint.getBlockY() > max.getBlockY()) return false;
+        if (rMinPoint.getBlockZ() > max.getBlockZ()) 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.x(),
-                        lastPt1.z(),
-                        aPts1.x(),
-                        aPts1.z());
+                        lastPt1.getBlockX(),
+                        lastPt1.getBlockZ(),
+                        aPts1.getBlockX(),
+                        aPts1.getBlockZ());
 
                 if (line1.intersectsLine(
-                        lastPt2.x(),
-                        lastPt2.z(),
-                        aPts2.x(),
-                        aPts2.z())) {
+                        lastPt2.getBlockX(),
+                        lastPt2.getBlockZ(),
+                        aPts2.getBlockX(),
+                        aPts2.getBlockZ())) {
                     return true;
                 }
                 lastPt2 = aPts2;

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

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

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().y(), region.getMaximumPoint().y());
+                    region.getMinimumPoint().getY(), region.getMaximumPoint().getY());
         }
         return null;
     }
@@ -68,7 +68,7 @@ public final class WorldEditRegionConverter {
         }
         if (region instanceof ProtectedPolygonalRegion) {
             return new Polygonal2DRegionSelector(null, region.getPoints(),
-                    region.getMinimumPoint().y(), region.getMaximumPoint().y());
+                    region.getMinimumPoint().getY(), region.getMaximumPoint().getY());
         }
         return null;
     }

worldguard-core/src/main/java/com/sk89q/worldguard/session/AbstractSessionManager.java

@@ -19,7 +19,6 @@
 
 package com.sk89q.worldguard.session;
 
-import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
@@ -68,9 +67,10 @@ public abstract class AbstractSessionManager implements SessionManager {
             .expireAfterWrite(2, TimeUnit.SECONDS)
             .build(CacheLoader.from(tuple -> BYPASS_PERMISSION_TEST.test(tuple.getWorld(), tuple.getPlayer())));
 
-    private final Cache<CacheKey, Session> sessions = CacheBuilder.newBuilder()
+    private final LoadingCache<CacheKey, Session> sessions = CacheBuilder.newBuilder()
             .expireAfterAccess(SESSION_LIFETIME, TimeUnit.MINUTES)
-            .build();
+            .build(CacheLoader.from(key ->
+                    createSession(key.playerRef.get())));
 
     private boolean hasCustom = false;
     private List<Handler.Factory<? extends Handler>> handlers = new LinkedList<>();
@@ -152,7 +152,7 @@ public abstract class AbstractSessionManager implements SessionManager {
     @Override
     public void resetState(LocalPlayer player) {
         checkNotNull(player, "player");
-        @Nullable Session session = getIfPresentInternal(new CacheKey(player));
+        @Nullable Session session = sessions.getIfPresent(new CacheKey(player));
         if (session != null) {
             session.resetState(player);
         }
@@ -161,35 +161,22 @@ public abstract class AbstractSessionManager implements SessionManager {
     @Override
     @Nullable
     public Session getIfPresent(LocalPlayer player) {
-        return getIfPresentInternal(new CacheKey(player));
-    }
-
-    private Session getIfPresentInternal(CacheKey cacheKey) {
-        @Nullable Session session = sessions.getIfPresent(cacheKey);
-        if (session != null) {
-            session.ensureInitialized(cacheKey.playerRef.get(), this::initializeSession);
-            return session;
-        }
-        return null;
+        return sessions.getIfPresent(new CacheKey(player));
     }
 
     @Override
     public Session get(LocalPlayer player) {
-        Session session = sessions.asMap().computeIfAbsent(new CacheKey(player), (k) -> new Session(this));
-        session.ensureInitialized(player, this::initializeSession);
-        return session;
+        return sessions.getUnchecked(new CacheKey(player));
     }
 
     @Override
     public Session createSession(LocalPlayer player) {
-        return get(player);
-    }
-
-    private void initializeSession(Session session, LocalPlayer player) {
+        Session session = new Session(this);
         for (Handler.Factory<? extends Handler> factory : handlers) {
             session.register(factory.create(session));
         }
         session.initialize(player);
+        return session;
     }
 
     protected static final class CacheKey {

worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java

@@ -38,7 +38,6 @@ import javax.annotation.Nullable;
 import java.util.HashMap;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.BiConsumer;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -53,7 +52,6 @@ public class Session {
     private Location lastValid;
     private Set<ProtectedRegion> lastRegionSet;
     private final AtomicBoolean needRefresh = new AtomicBoolean(false);
-    private boolean initialized;
 
     /**
      * Create a new session.
@@ -112,7 +110,7 @@ public class Session {
         disableBypass = cfg.disableDefaultBypass;
         if (cfg.announceBypassStatus && player.hasPermission("worldguard.region.toggle-bypass")) {
             player.printInfo(TextComponent.of(
-                    "You are " + (disableBypass ? "not " : "") + "bypassing region protection. " +
+                    "You are " + (disableBypass ? "not" : "") + " bypassing region protection. " +
                     "You can toggle this with /rg bypass", TextColor.DARK_PURPLE));
         }
 
@@ -122,14 +120,6 @@ public class Session {
         }
     }
 
-    synchronized void ensureInitialized(LocalPlayer player, BiConsumer<Session, LocalPlayer> initializer) {
-        if (initialized) {
-            return;
-        }
-        initialized = true;
-        initializer.accept(this, player);
-    }
-
     /**
      * Uninitialize the session.
      *

worldguard-core/src/main/java/com/sk89q/worldguard/session/SessionManager.java

@@ -95,9 +95,7 @@ public interface SessionManager {
      *
      * @param player The player
      * @return The new session
-     * @deprecated Use {@link SessionManager#get} instead
      */
-    @Deprecated
     Session createSession(LocalPlayer player);
 
     /**

worldguard-libs/build.gradle.kts

@@ -1,3 +1,3 @@
 tasks.register("build") {
     dependsOn(subprojects.map { it.tasks.named("build") })
-}
+}

worldguard-libs/bukkit/build.gradle.kts

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

worldguard-libs/core/build.gradle.kts

@@ -1,10 +1,18 @@
-plugins {
-    id("buildlogic.libs")
-}
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+applyLibrariesConfiguration()
 
 dependencies {
-    "shade"(libs.squirrelid) {
-        isTransitive = false
-    }
-    "shade"(libs.prtree)
+    "shade"("org.enginehub:squirrelid:${Versions.SQUIRRELID}")
+    "shade"("org.khelekore:prtree:1.5.0")
+}
+
+tasks.named<ShadowJar>("jar") {
+    dependencies {
+        relocate("org.enginehub.squirrelid", "com.sk89q.worldguard.util.profile") {
+            include(dependency("org.enginehub:squirrelid"))
+        }
+
+        include(dependency("org.khelekore:prtree"))
+    }
 }

worldguard-logo.svg

@@ -1 +1 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 614.2 143.1" xml:space="preserve"><style>.st4{opacity:.1}.st7{fill:#fff}</style><g id="Layer_2_00000052784576965984388860000017441764153098466226_"><g id="Layer_4"><path d="m242.9 32.2-17.2 64h-10.4l-11.8-38.9-11.8 38.9h-10.4l-17.1-64h13.1l9.9 40.4 11.7-40.4h9.4L220 72.6l10-40.4h12.9zm40.3 40.5c.1 3.6-.3 7.2-1.1 10.7-.7 2.8-2.2 5.5-4.2 7.6-3.7 3.8-8.5 5.8-14.6 5.8s-10.9-1.9-14.5-5.8c-2-2.1-3.5-4.7-4.2-7.6-.8-3.5-1.2-7.1-1.1-10.7 0-8.4 1.8-14.5 5.4-18.3 3.6-3.8 8.4-5.7 14.4-5.7 6.1 0 10.9 1.9 14.5 5.7s5.4 9.9 5.4 18.3zm-11.8 0c0-5.8-.9-9.5-2.7-11.3a7.2 7.2 0 0 0-5.4-2.1 7 7 0 0 0-5.3 2.1c-1.8 1.8-2.7 5.6-2.7 11.3s.9 9.6 2.7 11.4a7 7 0 0 0 5.3 2.1c2 .1 4-.7 5.4-2.1 1.8-1.8 2.7-5.6 2.7-11.4zm52.7-19.5-8.8 8.9a8.6 8.6 0 0 0-6.2-2.8 7 7 0 0 0-5.1 2.1 8.6 8.6 0 0 0-2.4 6.6v28.2h-11.7V49.3h11.4v4.5c2.8-3.3 6.8-5 11.8-5a15 15 0 0 1 11 4.4zm22 43h-6.7c-4.5 0-8-1.4-10.5-4.2a13.3 13.3 0 0 1-3.2-9.2V32.2h11.8v49.9c0 2.8 1.4 4.2 4.1 4.2h4.5v9.9zm42.3 0H377v-4.4a14.6 14.6 0 0 1-11.6 4.9c-4.9 0-8.7-1.4-11.5-4.2a15.8 15.8 0 0 1-4.1-9c-.5-3.6-.7-7.2-.6-10.8-.1-3.6.1-7.2.6-10.7.7-3.9 2-6.9 4.1-9 2.8-2.8 6.6-4.2 11.4-4.2 4.8 0 8.6 1.6 11.4 4.7V32.2h11.8l-.1 64zm-11.8-23.5c0-4.4-.5-7.6-1.3-9.5-1.2-2.6-3.4-3.9-6.6-3.9-3.4 0-5.7 1.5-6.9 4.5-.7 1.8-1 4.8-1 8.9s.3 7.1 1 8.9c1 2.9 3.8 4.8 6.9 4.6 3.2 0 5.4-1.3 6.6-3.9.9-1.9 1.3-5.1 1.3-9.6zm66.5-3c0 9-2 15.5-5.9 19.7a23.7 23.7 0 0 1-17.9 7.4c-6.5.1-12.7-2.4-17.3-7-3-3-4.9-6.9-5.6-11.1-.5-2.7-.7-7.5-.7-14.5s.2-11.8.7-14.5c.7-4.2 2.6-8 5.6-11.1a23.7 23.7 0 0 1 17.3-7c3.8-.1 7.5.5 11 1.9 3.2 1.6 6.2 3.7 8.6 6.3l-8.5 8.5c-1.5-1.6-3.2-3-5-4.1a13 13 0 0 0-6.1-1.3c-3-.1-6 1.1-8 3.4-1.6 1.8-2.5 4.7-2.9 8.6a139 139 0 0 0 0 18.7c.4 4 1.3 6.9 2.9 8.7 2 2.2 5 3.5 8 3.3a11 11 0 0 0 8.5-3.6c1.9-2 2.8-4.9 2.8-8.7V71h-11.4V60.5H443v9.2zm45.2 26.5h-11.4v-4.3c-3 3.2-7.3 5-11.7 4.8-4.6 0-8.3-1.4-11.1-4.1a18 18 0 0 1-4.8-13.3v-30h11.8v28.4c0 2.9.8 5.2 2.5 6.7 1.4 1.3 3.3 2 5.2 1.9 1.9.1 3.8-.6 5.2-1.9 1.7-1.5 2.5-3.7 2.5-6.7V49.3h11.8v46.9zm44.1 0H521v-4a16 16 0 0 1-11.5 4.5c-5.3 0-9.2-1.3-11.9-4.1a14.4 14.4 0 0 1-4-10.6 13 13 0 0 1 4.1-9.8c2.7-2.6 6.7-3.8 11.9-3.8h11V66c0-4.9-2.9-7.4-8.7-7.4-3.4-.2-6.8 1.3-9 3.9l-7.4-7.3c2-2.3 4.5-4 7.3-5.1 3.1-1 6.4-1.5 9.6-1.3 13.3 0 20 5.5 20 16.5v30.9zm-11.8-17.3v-2.5h-9.2c-4.4 0-6.5 1.8-6.5 5.3s2.2 5.4 6.7 5.4c4 0 6.6-1 8-3 .8-1.6 1.1-3.4 1-5.2zm54.1-25.7-8.8 8.9a8.6 8.6 0 0 0-6.2-2.8 7 7 0 0 0-5.1 2.1 8.6 8.6 0 0 0-2.4 6.6v28.2h-11.7V49.3h11.4v4.5c2.8-3.3 6.8-5 11.8-5 4-.1 8 1.5 11 4.4zm39.5 43h-11.4v-4.4a14.6 14.6 0 0 1-11.6 4.9c-4.9 0-8.7-1.4-11.5-4.2a15.8 15.8 0 0 1-4.1-9c-.5-3.6-.7-7.2-.6-10.8-.1-3.6.1-7.2.6-10.7.7-3.9 2-6.9 4.1-9 2.8-2.8 6.6-4.2 11.4-4.2 4.8 0 8.6 1.6 11.4 4.7V32.2h11.8v64zm-11.7-23.5c0-4.4-.4-7.6-1.3-9.5-1.2-2.6-3.4-3.9-6.6-3.9-3.4 0-5.7 1.5-6.8 4.5-.7 1.8-1 4.8-1 8.9s.3 7.1 1 8.9c1 2.9 3.8 4.8 6.8 4.6 3.2 0 5.4-1.3 6.6-3.9.8-1.9 1.3-5.1 1.3-9.6z" fill="#2d2d2d" stroke="#fff" stroke-miterlimit="10"/><g><defs><path id="SVGID_1_" d="M78.5 138.1c-3.8 3.9-10.4 3.4-14.3-.4L5.1 78.5A9.8 9.8 0 0 1 5 64.6l.1-.1L63.6 6c3.9-3.8 11.3-4.7 15.1-.8l59 59c3.9 3.9 3.6 11.1-.2 15l-59 58.9z"/></defs><clipPath id="SVGID_00000145029192010834712300000017443068230347339956_"><use xlink:href="#SVGID_1_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_00000145029192010834712300000017443068230347339956_)"><path fill="none" d="M56.1 65.2h45.2v3H56.1z"/><linearGradient id="SVGID_00000069364478787755211970000003740009090250123963_" gradientUnits="userSpaceOnUse" x1="71.6" y1="142.1" x2="71.6" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><path d="M74.9 1.4a4.8 4.8 0 0 0-6.8 0L32.5 37.1h78.1L74.9 1.4z" fill="url(#SVGID_00000069364478787755211970000003740009090250123963_)"/><g><g class="st4"><path d="M74.9 1.4a4.8 4.8 0 0 0-6.8 0L32.5 37.1h78.1L74.9 1.4z"/></g></g><linearGradient id="SVGID_00000084519624245935921250000012172575822901895094_" gradientUnits="userSpaceOnUse" x1="71.5" y1="142.1" x2="71.5" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><path d="m141.7 68.2-16.4-16.4v4.3h-14v-8h-12v8H42v-8H31v8H16.9v-3.5L1.4 68.2a4.8 4.8 0 0 0 0 6.8l18.5 18.5V60.1H31v11h11v-11h57.2v11h12v-11h11v34.2l19.4-19.4c1.9-1.8 2-4.8.1-6.7z" fill="url(#SVGID_00000084519624245935921250000012172575822901895094_)"/><g><g class="st4"><path d="m141.7 68.2-16.4-16.4v4.3h-14v-8h-12v8H42v-8H31v8H16.9v-3.5L1.4 68.2a4.8 4.8 0 0 0 0 6.8l18.5 18.5V60.1H31v11h11v-11h57.2v11h12v-11h11v34.2l19.4-19.4c1.9-1.8 2-4.8.1-6.7z"/></g></g><linearGradient id="SVGID_00000102525750365294681190000017673805805378204844_" gradientUnits="userSpaceOnUse" x1="71.6" y1="142.2" x2="71.6" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><Line truncated
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 614.24 143.11"><defs><style>.cls-1{fill:none;}.cls-2{fill:#2d2d2d;}.cls-3{clip-path:url(#clip-path);}.cls-4{fill:url(#New_Gradient_Swatch_copy);}.cls-5{mask:url(#mask);}.cls-6{opacity:0.1;}.cls-7{fill:url(#New_Gradient_Swatch_copy-2);}.cls-8{mask:url(#mask-2);}.cls-9{fill:url(#New_Gradient_Swatch_copy-3);}.cls-10{mask:url(#mask-3);}.cls-11{fill:#fff;}.cls-12{filter:url(#luminosity-invert);}</style><clipPath id="clip-path"><path class="cls-1" d="M78.54,138.1c-3.85,3.85-10.45,3.45-14.33-.42L5.07,78.54a9.85,9.85,0,0,1-.07-14L63.63,6c3.85-3.85,11.25-4.68,15.13-.8l59,59c3.88,3.88,3.63,11.13-.23,15Z"/></clipPath><linearGradient id="New_Gradient_Swatch_copy" x1="71.56" y1="3.86" x2="71.56" y2="141.19" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><filter id="luminosity-invert" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feColorMatrix values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/></filter><mask id="mask" x="29.59" y="-2.48" width="83" height="42" maskUnits="userSpaceOnUse"><g class="cls-12"><image width="83" height="42" transform="translate(29.59 -2.48)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFMAAAAqCAYAAADPn2cJAAAACXBIWXMAAAsSAAALEgHS3X78AAAGoklEQVRoQ+2bWXObQBCEGxDLcsjR6eT//7vEcbmcyDE3eVD11jBaST50PXiqKKILlo+entnFCQAM+IqTRHjsC1/x9pgc+8I1IwxDRFEEAAiCAH3fu+0W42ZhTiYTWGthjHFA27ZF0zQoyxJt2x45wuXjJmHGcYyiKJDn+Qhm13Wo6xovLy/YbDZomubIkS4bNwczSRJ8+/ZtBDMMt9be9z3qukaSJDDG4Pn5GWVZHjni5eKmYFprMZ/PcXd3h+l0iizLEMfxSJlN0yBJEsRxjDAM8fT0dDNAbwamtRar1Qrz+RzT6RRFUcBaiyRJRsqsqsq9T9CPj494fX09cobzx03ATNMUq9UKy+USs9kM0+kUeZ7DWutVZlmWDuZkMkEYhnh4eLg60KvDzLIM6/Uay+USi8Vi5JcynYGtMpum2VFnGIYO6MvLy5Ezni+uCjPLMtzf32O9XmOxWGA2m+Hu7g5FUSDLsqMwqcwoihBFEYIgwK9fv64G9Gow8zzH9+/fsVqtnFfOZjMURYGiKJCm6VGYxhgkSeKABkHggG42myMjOH1cBSZB3t/fY7lcOq+UKU6Y9ERgC7NtW5Rl6dKcfShhhmGIIAgwDMPFFXpxmHme48ePH1iv1zteOZ1OXUskZz+yALVtizRNXREyxjhl0juB7fTz58+f+Pv376HhnDQuCpMg6ZMEOZ/PnSqZ4tITtTLZa/pAMtX5m2EYLpbyF4MpQcr0plfKwpOmKYwxDlYQBAC2YNq2Hc2C4jh27ROhEugwbFcXL6XQi8DUINlTEiRTPM/zUYpLSMA2zdlr1nU9quZSmQB29pdQ6Nlh7gMp05sznizLXEtEmNIHufwmYUpF+mACuJhCzwpTVm16pATJ2Q5hsoLLmQ+rNLCF0nXdTmrr9GYMw+A2vu77/mxV/mwwsyxzINlLMrUlSO2VcprI4iNhsggRIj1Vf88XUqHnSPmzwCTI9Xq9k9bSIyVImd5siWSKM/q+dxClGiVIqUTeAG7y9b9//3bG/pk4OUw5RZQgZ7PZCKT2SRYdVnCpNBm+NkiDPASRewAnn3qeFGaapg6iVCIhUolylsOeUk4NtRp1BEHgKjxjH8S2bV0X0HXd6BkSv3uq1aaTwbTW7i0yhJjnuYNorXUeqRX51pBAj0H0Ae26DsMw4OHh4SQpfxKYXNhdLBYupaUS8zzfUaNuut8LkhGG2yeYcRyPWqc0TdG2rZsxyb0EK2/CZ1fsPw3TWrvTN/Kxg0xpLkxob5RN90eClVxWd2MM2raFtXYEVkLVYIdhwO/fvz8F9FMwkyQZtToSopzNSIi67ZF95EdDzsfDMHTHj+PYeXFd10jT1DX8hEmgVOfj4yOqqjp2Sm98GKYxZm9hkRCPLUicImRf6QNLK+F4rLXIsswpVKq073s8PT19COiHYMZx7CBKkNIPZfMtZyq6jem6zr2/rx06FLLosPUhXAmWFqChUq3SBgj0vc/l3w0zjmPXJ3JxgtWZ00C9AEFAsopybZKf6dXyQ1D19JBFR6YtVeYDK9VqrUVVVQ6qLE5//vx5F9B3wZxMJsjz/CBELk7oKSDhUQEsOPJzpqZWqJ4mcs/CIW+O9kQJlsciVN50+qq11v2Wv9tsNm/+U5w3w4yiCFmWjSD65tEMDZEApUrbtt2xAl4o4F9G41436F3XOYAEUpYlqqryFhuGzwKste77fb+ddr4F6JtgRlHkTFtDlKnpA1hVlVeF2g58xWlfuyS9UcKUyqdCq6oabbLg8Di+gmWMgbXWwX99fUXXdd7xMI7CZDr4WhupGF5IXdcjlTINeZGEKCu8hikVrL1TqpLH3geUCvVBresadV2PFMjzyX61abaPSLpu+0djh4AehEmQvqeAvKtahTqNm6aBMQZVVY18VTfsPK5UOuCHyb2u5NI7pUK5EWJVVc4C+J60AILluIwxo4ImbULGXpi8MAlQp7IuJBosZzoaYByPV8hl1ZcprkEyOAad6hKo9FCtVKlWKlT6qwTHsVCt8rw6vDClh2hYhwAyfSU8mc4yrWkFMq0lUI7DFzrVJVyCkJXcp9Z9gOVGsARHqLxxGuhemNIPOTipTJ6cSpOK0/B8RUaD9MHkWGTINJfj03uqVO4JWO6leiVwvecxfHwYOzA1RN4ZqtIHR9rBIWhvUeIhkAx5AT6VcuPYtbdqwNoe+Fqrm+/viwDY/a8rvouTfqY3Hxyf2uSmzyP3vrEwfF7lU6v+t7YD32v9md58x5bhhfkVH4uPLSJ+hTf+A45XAcRn3tf4AAAAAElFTkSuQmCC"/></g></mask><linearGradient id="New_Gradient_Swatch_copy-2" x1="71.55" y1="3.86" x2="71.55" y2="141.19" xlink:href="#New_Gradient_Swatch_copy"/><mask id="mask-2" x="-2.41" y="45.52" width="148" height="51" maskUnits="userSpaceOnUse"><g class="cls-12"><image width="148" height="51" transform="translate(-2.41 45.52)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJQAAAAzCAYAAABxJSGCAAAACXBIWXMAAAsSAAALEgHS3X78AAAInklEQVR4Xu1d63arvA4cY65J3/9BdxpuBnN+5IwRhiRA0n609azFSgMJYGk0koWztwIwICDgTYiefSAgYAviZx/4Diil3Cs3iWEYJttvB8cfRdHENgRtcES7HIJQAKC1RhzHiKJoYshhGGCtRd/3bjuK8b4ScRzPbEJYa2GtRdd1h7PJIQgVRRHiOEaSJEiSBFprZ0Aarus6GGNgrT2M8b4KURRBa40sy5CmqSOVUmoSYG3bomkaWGufnfLbcAhCKaWgtUaSJMiybEYorTWUUuj7fpYOfyOUUs4WaZoiSZKJavd9j67rnE2MMU/O+H04BKGAW8qj8RiRwI1QjExjzJ8hFANM2oRj77oOURRhGIbJ/iPgEISiAVkzcGOtAEyV6reD9mAZwLTHwGKw9X0/Cb6tWCr0X8VbCPXqjbHoJJEo8VprVzORcH+BUL4tZF0pCdV13UsKpZRy53xXbfoyoRhNwI1Mfd8/+cYcURQ5o3F2o7XGMAwz9eK1fjN8O8jZHm1irZ2o+R6QuMA4+Xm1wN93J/8Hb4jKYa11g/Z7I/xb9lUYIXmeu/NQmRiFSinEcYy+75EkCfI8n02V3xFZ/xV8e2itnT18UsnUJtWrKAo3E37Uk+K1mBFkbcZZozFmlygQuwkli0ZJKDqb9c/SACWZ0jR15+BAeQyAk3gSLU3TWQvBP//RCeanKI5X2kMGGMfuE4JES9MURVGgaRpnewBOzfxr0HfMCvRdkiSo6xpN06DrOuzBLkJxEHmeOzIAcIQyxswiRjqZg5MGI5G4yc9KAjKKGUVSon0VPDKWxiiVyB+ztIt/nJmC9gamtpDnj+MYWZY5dSKhhmGYzLCrqtpFqs2EoiSfTqdJ042FHfOw73BfNbhf67HwJnxS8fu8xiMFPLine truncated