Skip to content

Commit 111eebe

Browse files
committed
Merge branch 'main' into v3
# Conflicts: # worldedit-core/src/main/java/com/fastasyncworldedit/core/extent/TransformExtent.java # worldedit-core/src/main/java/com/sk89q/worldedit/function/pattern/RandomPattern.java
2 parents fbb8a9b + c095c49 commit 111eebe

File tree

363 files changed

+5415
-3637
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+5415
-3637
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,9 @@ body:
2727
description: Which server version version you using? If your server version is not listed, it is not supported. Update to a supported version first.
2828
multiple: false
2929
options:
30-
- '1.20.4'
30+
- '1.20.5/6'
3131
- '1.20'
3232
- '1.19.4'
33-
- '1.18.2'
3433
validations:
3534
required: true
3635

.github/renovate.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
"$schema" : "https://docs.renovatebot.com/renovate-schema.json",
33
"extends" : [
44
"config:recommended",
5-
":semanticCommitsDisabled"
5+
":semanticCommitsDisabled",
6+
"schedule:earlyMondays"
67
],
78
"automerge" : true,
89
"ignoreDeps" : [

.github/workflows/build-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
- name: Checkout Repository
1212
uses: actions/checkout@v4
1313
- name: Validate Gradle Wrapper
14-
uses: gradle/wrapper-validation-action@v2
14+
uses: gradle/actions/wrapper-validation@v3
1515
- name: Setup Java
1616
uses: actions/setup-java@v4
1717
with:
1818
distribution: temurin
1919
cache: gradle
20-
java-version: 17
20+
java-version: 21
2121
- name: Build on ${{ matrix.os }}
2222
run: ./gradlew build -s
2323
- name: Archive artifacts

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ jobs:
1111
- name: Checkout Repository
1212
uses: actions/checkout@v4
1313
- name: Validate Gradle Wrapper
14-
uses: gradle/wrapper-validation-action@v2
14+
uses: gradle/actions/wrapper-validation@v3
1515
- name: Setup Java
1616
uses: actions/setup-java@v4
1717
with:
1818
distribution: temurin
1919
cache: gradle
20-
java-version: 17
20+
java-version: 21
2121
- name: Clean Build
2222
run: ./gradlew clean build --no-daemon
2323
- name: Determine release status

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
with:
2626
distribution: temurin
2727
cache: gradle
28-
java-version: 17
28+
java-version: 21
2929
- name: Initialize CodeQL
3030
uses: github/codeql-action/init@v3
3131
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Label conflicting PRs
18-
uses: eps1lon/[email protected].0
18+
uses: eps1lon/[email protected].2
1919
with:
2020
dirtyLabel: "unresolved-merge-conflict"
2121
repoToken: "${{ secrets.GITHUB_TOKEN }}"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ jobs:
99
- name: Checkout Repository
1010
uses: actions/checkout@v4
1111
- name: Validate Gradle Wrapper
12-
uses: gradle/wrapper-validation-action@v2
12+
uses: gradle/actions/wrapper-validation@v3
1313
- name: Setup Java
1414
uses: actions/setup-java@v4
1515
with:
1616
distribution: temurin
1717
cache: gradle
18-
java-version: 17
18+
java-version: 21
1919
- name: Clean Build
2020
run: ./gradlew clean build --no-daemon
2121
- name: Upload Release Assets

COMPILING.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
= Compiling
55

6-
You can compile FastAsyncWorldEdit as long as you have some version of Java greater than or equal to 17 installed. Gradle will download JDK 17 specifically if needed,
6+
You can compile FastAsyncWorldEdit as long as you have some version of Java greater than or equal to 21 installed. Gradle will download JDK 21 specifically if needed,
77
but it needs some version of Java to bootstrap from.
88

9-
Note that if you have JRE 8 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 8 and replace it with JDK 17.
9+
Note that if you have JRE 8 installed, Gradle will currently attempt to use that to compile, which will not work. It is easiest to uninstall JRE 8 and replace it with JDK 21.
1010

11-
You can get the JDK 17 link:https://adoptium.net/[here] from Adoptium.
11+
You can get the JDK 21 link:https://adoptium.net/[here] from Adoptium.
1212

1313
The build process uses Gradle, which you do *not* need to download. FastAsyncWorldEdit is a multi-module project with three active modules:
1414

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ pipeline {
77
stage('Build') {
88
steps {
99
withEnv([
10-
"PATH+JAVA=${tool 'Temurin-17.0.7_7'}/bin"
10+
"PATH+JAVA=${tool 'Temurin-21.0.3_9'}/bin"
1111
]) {
1212
sh './gradlew clean build'
1313
}

build.gradle.kts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import java.time.format.DateTimeFormatter
66
import xyz.jpenilla.runpaper.task.RunServer
77

88
plugins {
9-
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
10-
id("xyz.jpenilla.run-paper") version "2.2.3"
9+
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
10+
id("xyz.jpenilla.run-paper") version "2.3.0"
1111
}
1212

1313
if (!File("$rootDir/.git").exists()) {
@@ -34,7 +34,7 @@ logger.lifecycle("""
3434
*******************************************
3535
""")
3636

37-
var rootVersion by extra("2.9.2")
37+
var rootVersion by extra("2.10.1")
3838
var snapshot by extra("SNAPSHOT")
3939
var revision: String by extra("")
4040
var buildNumber by extra("")
@@ -83,7 +83,7 @@ allprojects {
8383
}
8484

8585
applyCommonConfiguration()
86-
val supportedVersions = listOf("1.18.2", "1.19.4", "1.20", "1.20.4")
86+
val supportedVersions = listOf("1.19.4", "1.20", "1.20.4", "1.20.5", "1.20.6")
8787

8888
tasks {
8989
supportedVersions.forEach {

0 commit comments

Comments
 (0)