Merge branch 'v3' into feature/anvil

.editorconfig

@@ -342,7 +342,7 @@ ij_editorconfig_space_before_colon = false
 ij_editorconfig_space_before_comma = false
 ij_editorconfig_spaces_around_assignment_operators = true
 
-[{*.ant, *.fxml, *.jhm, *.jnlp, *.jrxml, *.pom, *.rng, *.tld, *.wsdl, *.xml, *.xsd, *.xsl, *.xslt, *.xul}]
+[{*.ant,*.fxml,*.jhm,*.jnlp,*.jrxml,*.pom,*.rng,*.tld,*.wsdl,*.xml,*.xsd,*.xsl,*.xslt,*.xul}]
 ij_xml_align_attributes = true
 ij_xml_align_text = false
 ij_xml_attribute_wrap = normal
@@ -360,7 +360,7 @@ ij_xml_space_around_equals_in_attribute = false
 ij_xml_space_inside_empty_tag = false
 ij_xml_text_wrap = normal
 
-[{*.ats, *.ts}]
+[{*.ats,*.ts}]
 ij_continuation_indent_size = 4
 ij_typescript_align_imports = false
 ij_typescript_align_multiline_array_initializer_expression = false
@@ -528,7 +528,7 @@ ij_typescript_while_brace_force = never
 ij_typescript_while_on_new_line = false
 ij_typescript_wrap_comments = false
 
-[{*.bash, *.sh, *.zsh}]
+[{*.bash,*.sh,*.zsh}]
 indent_size = 2
 tab_width = 2
 ij_shell_binary_ops_start_line = false
@@ -537,7 +537,7 @@ ij_shell_minify_program = false
 ij_shell_redirect_followed_by_space = false
 ij_shell_switch_cases_indented = false
 
-[{*.cjs, *.js}]
+[{*.cjs,*.js}]
 ij_continuation_indent_size = 4
 ij_javascript_align_imports = false
 ij_javascript_align_multiline_array_initializer_expression = false
@@ -702,10 +702,10 @@ ij_javascript_while_brace_force = never
 ij_javascript_while_on_new_line = false
 ij_javascript_wrap_comments = false
 
-[{*.ft, *.vm, *.vsl}]
+[{*.ft,*.vm,*.vsl}]
 ij_vtl_keep_indents_on_empty_lines = false
 
-[{*.gant, *.gradle, *.groovy, *.gy}]
+[{*.gant,*.gradle,*.groovy,*.gy}]
 ij_groovy_align_group_field_declarations = false
 ij_groovy_align_multiline_array_initializer_expression = false
 ij_groovy_align_multiline_assignment = false
@@ -884,7 +884,7 @@ ij_groovy_while_brace_force = never
 ij_groovy_while_on_new_line = false
 ij_groovy_wrap_long_lines = false
 
-[{*.gradle.kts, *.kt, *.kts, *.main.kts}]
+[{*.gradle.kts,*.kt,*.kts,*.main.kts}]
 ij_kotlin_align_in_columns_case_branch = false
 ij_kotlin_align_multiline_binary_operation = false
 ij_kotlin_align_multiline_extends_list = false
@@ -963,7 +963,7 @@ ij_kotlin_wrap_elvis_expressions = 1
 ij_kotlin_wrap_expression_body_functions = 0
 ij_kotlin_wrap_first_method_in_call_chain = false
 
-[{*.har, *.jsb2, *.jsb3, *.json, .babelrc, .eslintrc, .stylelintrc, bowerrc, jest.config, mcmod.info}]
+[{*.har,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config,mcmod.info}]
 indent_size = 2
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
@@ -976,7 +976,7 @@ ij_json_spaces_within_braces = false
 ij_json_spaces_within_brackets = false
 ij_json_wrap_long_lines = false
 
-[{*.htm, *.html, *.sht, *.shtm, *.shtml}]
+[{*.htm,*.html,*.sht,*.shtm,*.shtml}]
 ij_html_add_new_line_before_tags = body, div, p, form, h1, h2, h3
 ij_html_align_attributes = true
 ij_html_align_text = false
@@ -1004,7 +1004,7 @@ ij_html_space_inside_empty_tag = false
 ij_html_text_wrap = normal
 ij_html_uniform_ident = false
 
-[{*.yaml, *.yml}]
+[{*.yaml,*.yml}]
 indent_size = 2
 ij_yaml_keep_indents_on_empty_lines = false
 ij_yaml_keep_line_breaks = true

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -27,11 +27,10 @@ body:
  description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
  multiple: false
  options:
- - '1.20.2'
+ - '1.20.4'
  - '1.20'
  - '1.19.4'
  - '1.18.2'
- - '1.17.1'
  validations:
  required: true
 

.github/renovate.json

@@ -1,18 +1,18 @@
 {
- "$schema": "https://docs.renovatebot.com/renovate-schema.json",
- "extends": [
- "config:base",
+ "$schema" : "https://docs.renovatebot.com/renovate-schema.json",
+ "extends" : [
+ "config:recommended",
  ":semanticCommitsDisabled"
  ],
- "automerge": true,
- "ignoreDeps": [
- "guava", 
+ "automerge" : true,
+ "ignoreDeps" : [
+ "guava",
  "com.google.guava:guava",
  "rhino-runtime",
  "org.antlr",
  "antlr4-runtime",
  "fastutil",
- "it.unimi.dsi:fastutil", 
+ "it.unimi.dsi:fastutil",
  "auto-value-annotations",
  "auto-value",
  "com.google.code.gson:gson",
@@ -29,7 +29,34 @@
  "org.spongepowered:spongeapi",
  "org.yaml:snakeyaml"
  ],
- "labels": ["Renovate"],
- "rebaseWhen": "conflicted",
- "schedule": ["on the first day of the month"]
+ "labels" : [
+ "Renovate"
+ ],
+ "rebaseWhen" : "conflicted",
+ "customManagers" : [
+ {
+ "customType" : "regex",
+ "datasourceTemplate" : "custom.paperweight-userdev",
+ "fileMatch" : "^worldedit-bukkit\\/adapters\\/adapter-\\d+_\\d+(_\\d+)?\\/build\\.gradle\\.kts$",
+ "matchStrings" : [
+ "url=(?<registryUrl>.*)\\s",
+ "paperDevBundle\\(\"(?<currentValue>.*?)\"\\)\\s"
+ ],
+ "matchStringsStrategy": "combination",
+ "depNameTemplate" : "paperweight-userdev",
+ "extractVersionTemplate" : "(?<version>\\d+\\.\\d+\\.?\\d*-R0\\.1-\\d+\\.\\d+-\\d+)"
+ }
+ ],
+ "customDatasources" : {
+ "paperweight-userdev": {
+ "defaultRegistryUrlTemplate": "",
+ "format": "html"
+ }
+ },
+ "packageRules" : [
+ {
+ "matchDatasources" : ["custom.paperweight-userdev"],
+ "versioning": "regex:^(?<major>\\d+)\\.(?<minor>\\d+)\\.(?<patch>\\d+)?-R0\\.1-\\d+\\d+\\.\\d+-(?<build>\\d+)$"
+ }
+ ]
 }

.github/workflows/build-pr.yml

@@ -11,9 +11,9 @@ jobs:
  - name: Checkout Repository
  uses: actions/checkout@v4
  - name: Validate Gradle Wrapper
- uses: gradle/wrapper-validation-action@v1
+ uses: gradle/wrapper-validation-action@v2
  - name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
  cache: gradle

.github/workflows/build.yml

@@ -11,9 +11,9 @@ jobs:
  - name: Checkout Repository
  uses: actions/checkout@v4
  - name: Validate Gradle Wrapper
- uses: gradle/wrapper-validation-action@v1
+ uses: gradle/wrapper-validation-action@v2
  - name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
  cache: gradle

.github/workflows/codeql.yml

@@ -21,16 +21,16 @@ jobs:
  - name: Checkout repository
  uses: actions/checkout@v4
  - name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
  cache: gradle
  java-version: 17
  - name: Initialize CodeQL
- uses: github/codeql-action/init@v2
+ uses: github/codeql-action/init@v3
  with:
  languages: ${{ matrix.language }}
  - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ uses: github/codeql-action/autobuild@v3
  - name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v2
+ uses: github/codeql-action/analyze@v3

.github/workflows/label-merge-conflicts.yaml

@@ -15,7 +15,7 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Label conflicting PRs
- uses: eps1lon/actions-label-merge-conflict@v2.1.0
+ uses: eps1lon/actions-label-merge-conflict@v3.0.0
  with:
  dirtyLabel: "unresolved-merge-conflict"
  repoToken: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/release-drafter.yml

@@ -12,6 +12,6 @@ jobs:
  if: ${{ github.event_name != 'pull_request' || github.repository != github.event.pull_request.head.repo.full_name }}
  runs-on: ubuntu-latest
  steps:
- - uses: release-drafter/release-drafter@v5
+ - uses: release-drafter/release-drafter@v6
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/upload-release-assets.yml

@@ -9,17 +9,17 @@ jobs:
  - name: Checkout Repository
  uses: actions/checkout@v4
  - name: Validate Gradle Wrapper
- uses: gradle/wrapper-validation-action@v1
+ uses: gradle/wrapper-validation-action@v2
  - name: Setup Java
- uses: actions/setup-java@v3
+ uses: actions/setup-java@v4
  with:
  distribution: temurin
  cache: gradle
  java-version: 17
  - name: Clean Build
  run: ./gradlew clean build --no-daemon
  - name: Upload Release Assets
- uses: AButler/upload-release-assets@v2.0
+ uses: AButler/upload-release-assets@v3.0
  with:
  files: 'worldedit-bukkit/build/libs/FastAsyncWorldEdit-Bukkit-*.jar'
  repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle.kts

@@ -7,7 +7,7 @@ import xyz.jpenilla.runpaper.task.RunServer
 
 plugins {
  id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
- id("xyz.jpenilla.run-paper") version "2.2.0"
+ id("xyz.jpenilla.run-paper") version "2.2.3"
 }
 
 if (!File("$rootDir/.git").exists()) {
@@ -34,7 +34,7 @@ logger.lifecycle("""
 *******************************************
 """)
 
-var rootVersion by extra("2.8.3")
+var rootVersion by extra("2.9.2")
 var snapshot by extra("SNAPSHOT")
 var revision: String by extra("")
 var buildNumber by extra("")
@@ -83,7 +83,7 @@ allprojects {
 }
 
 applyCommonConfiguration()
-val supportedVersions = listOf("1.17.1", "1.18.2", "1.19.4", "1.20", "1.20.2")
+val supportedVersions = listOf("1.18.2", "1.19.4", "1.20", "1.20.4")
 
 tasks {
  supportedVersions.forEach {
@@ -97,7 +97,7 @@ tasks {
  }
  }
  runServer {
- minecraftVersion("1.20.2")
+ minecraftVersion("1.20.4")
  pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
  .toTypedArray())
 

buildSrc/build.gradle.kts

@@ -22,9 +22,9 @@ val properties = Properties().also { props ->
 
 dependencies {
  implementation(gradleApi())
- implementation("org.ajoberstar.grgit:grgit-gradle:5.2.1")
+ implementation("org.ajoberstar.grgit:grgit-gradle:5.2.2")
  implementation("com.github.johnrengelman:shadow:8.1.1")
- implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.5")
+ implementation("io.papermc.paperweight.userdev:io.papermc.paperweight.userdev.gradle.plugin:1.5.11")
 }
 
 kotlin {

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 # Minecraft expectations
-paper = "1.20.2-R0.1-SNAPSHOT"
+paper = "1.20.4-R0.1-SNAPSHOT"
 fastutil = "8.5.9"
 guava = "31.1-jre"
 log4j = "2.19.0"
@@ -11,19 +11,19 @@ snakeyaml = "2.0"
 dummypermscompat = "1.10"
 worldguard-bukkit = "7.0.9"
 mapmanager = "1.8.0-SNAPSHOT"
-griefprevention = "16.18.1"
+griefprevention = "17.0.0"
 griefdefender = "2.1.0-SNAPSHOT"
 residence = "4.5._13.1"
-towny = "0.100.0.1"
-plotsquared = "7.1.0"
+towny = "0.100.1.23"
+plotsquared = "7.3.6"
 
 # Third party
 bstats = "3.0.2"
 sparsebitset = "1.3"
 parallelgzip = "1.0.5"
-adventure = "4.14.0"
-adventure-bukkit = "4.3.1"
-checkerqual = "3.40.0"
+adventure = "4.16.0"
+adventure-bukkit = "4.3.2"
+checkerqual = "3.42.0"
 truezip = "6.8.4"
 auto-value = "1.10.4"
 findbugs = "3.0.2"
@@ -43,14 +43,14 @@ serverlib = "2.3.4"
 ## Internal
 text-adapter = "3.0.6"
 text = "3.0.4"
-piston = "0.5.7"
+piston = "0.5.8"
 
 # Tests
-mockito = "5.6.0"
+mockito = "5.11.0"
 
 # Gradle plugins
 pluginyml = "0.6.0"
-minotaur = "2.8.4"
+minotaur = "2.8.7"
 
 [libraries]
 # Minecraft expectations

gradle/wrapper/gradle-wrapper.properties

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

gradlew.bat

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

settings.gradle.kts

@@ -2,7 +2,7 @@ rootProject.name = "FastAsyncWorldEdit"
 
 include("worldedit-libs")
 
-listOf("legacy", "1_17_1", "1_18_2", "1_19_4", "1_20", "1_20_2").forEach {
+listOf("1_18_2", "1_19_4", "1_20", "1_20_2", "1_20_4").forEach {
  include("worldedit-bukkit:adapters:adapter-$it")
 }