Skip to content

Commit 66d919b

Browse files
PierreSchwangPierreSchwang
authored
Add 1.21.9 + 1.21.10 support (#3320)
1 parent 3568444 commit 66d919b

File tree

44 files changed

+9089
-30
lines changed

Some content is hidden

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

44 files changed

+9089
-30
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ 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.21.10'
31+
- '1.21.9'
3032
- '1.21.8'
3133
- '1.21.7'
3234
- '1.21.6'

‎build-logic/src/main/kotlin/buildlogic.adapter.gradle.kts‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import buildlogic.getVersion
12
import buildlogic.stringyLibs
23

34
plugins {
@@ -16,10 +17,23 @@ repositories {
1617
maven {
1718
name = "PaperMC"
1819
url = uri("https://repo.papermc.io/repository/maven-public/")
20+
content {
21+
excludeModule("io.papermc.paper", "dev-bundle")
22+
}
1923
}
2024
maven {
2125
name = "EngineHub Repository"
2226
url = uri("https://maven.enginehub.org/repo/")
27+
content {
28+
excludeModule("io.papermc.paper", "dev-bundle")
29+
}
30+
}
31+
maven {
32+
name = "IntellectualSites"
33+
url = uri("https://repo.intellectualsites.dev/repository/paper-dev-bundles/")
34+
content {
35+
includeModule("io.papermc.paper", "dev-bundle")
36+
}
2337
}
2438
mavenCentral()
2539
afterEvaluate {
@@ -32,7 +46,7 @@ dependencies {
3246
constraints {
3347
//Reduces the amount of libraries Gradle and IntelliJ need to resolve
3448
implementation("net.kyori:adventure-bom") {
35-
version { strictly("4.24.0") }
49+
version { strictly(stringyLibs.getVersion("adventure").strictVersion) }
3650
because("Ensure a consistent version of adventure is used.")
3751
}
3852
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ tasks.withType<Javadoc>().configureEach {
5858
"https://jd.advntr.dev/api/latest/",
5959
"https://logging.apache.org/log4j/2.x/javadoc/log4j-api/",
6060
"https://www.antlr.org/api/Java/",
61-
"https://jd.papermc.io/paper/1.21.8/",
61+
"https://jd.papermc.io/paper/1.21.10/",
6262
"https://intellectualsites.github.io/fastasyncworldedit-javadocs/worldedit-core/"
6363
)
6464
docTitle = "${rootProject.name}-${project.description}" + " " + "${rootProject.version}"

‎build.gradle.kts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ allprojects {
9393
}
9494
}
9595

96-
val supportedVersions: List<String> = listOf("1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.4", "1.21.5", "1.21.8")
96+
val supportedVersions: List<String> = listOf("1.20.4", "1.20.5", "1.20.6", "1.21", "1.21.1", "1.21.4", "1.21.5", "1.21.8", "1.21.10")
9797

9898
tasks {
9999
supportedVersions.forEach {
@@ -107,7 +107,7 @@ tasks {
107107
}
108108
}
109109
runServer<RunServer> {
110-
minecraftVersion("1.21.8")
110+
minecraftVersion(supportedVersions.last())
111111
pluginJars(*project(":worldedit-bukkit").getTasksByName("shadowJar", false).map { (it as Jar).archiveFile }
112112
.toTypedArray())
113113
jvmArgs("-Dcom.mojang.eula.agree=true")

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ plotsquared = "7.5.8"
2020
bstats = "3.1.0"
2121
sparsebitset = "1.3"
2222
parallelgzip = "1.0.5"
23-
adventure = "4.24.0"
23+
adventure = "4.25.0"
2424
adventure-bukkit = "4.4.1"
2525
checkerqual = "3.51.1"
2626
truezip = "6.8.4"

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ includeBuild("build-logic")
5555

5656
include("worldedit-libs")
5757

58-
listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5", "1_21_6").forEach {
58+
listOf("1_20_2", "1_20_4", "1_20_5", "1_21", "1_21_4", "1_21_5", "1_21_6", "1_21_9").forEach {
5959
include("worldedit-bukkit:adapters:adapter-$it")
6060
}
6161

‎worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks_Copy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ protected void storeBiomes(int layer, PalettedContainerRO<Holder<Biome>> biomeDa
201201
} else {
202202
try {
203203
for (int i = 0; i < 64; i++) {
204-
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET.invoke(i);
204+
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET
205+
.invoke(palettedContainer, i);
205206
}
206207
} catch (Throwable e) {
207208
throw new RuntimeException(e);

‎worldedit-bukkit/adapters/adapter-1_20_4/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R3/PaperweightGetBlocks_Copy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ protected void storeBiomes(int layer, PalettedContainerRO<Holder<Biome>> biomeDa
201201
} else {
202202
try {
203203
for (int i = 0; i < 64; i++) {
204-
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET.invoke(i);
204+
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET
205+
.invoke(palettedContainer, i);
205206
}
206207
} catch (Throwable e) {
207208
throw new RuntimeException(e);

‎worldedit-bukkit/adapters/adapter-1_20_5/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R4/PaperweightGetBlocks_Copy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ protected void storeBiomes(int layer, PalettedContainerRO<Holder<Biome>> biomeDa
204204
} else {
205205
try {
206206
for (int i = 0; i < 64; i++) {
207-
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET.invoke(i);
207+
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET
208+
.invoke(palettedContainer, i);
208209
}
209210
} catch (Throwable e) {
210211
throw new RuntimeException(e);

‎worldedit-bukkit/adapters/adapter-1_21/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_21_R1/PaperweightGetBlocks_Copy.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ protected void storeBiomes(int layer, PalettedContainerRO<Holder<Biome>> biomeDa
204204
} else {
205205
try {
206206
for (int i = 0; i < 64; i++) {
207-
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET.invoke(i);
207+
biomes[layer][i] = (Holder<Biome>) PaperweightPlatformAdapter.PALETTED_CONTAINER_GET
208+
.invoke(palettedContainer, i);
208209
}
209210
} catch (Throwable e) {
210211
throw new RuntimeException(e);

0 commit comments

Comments
 (0)