From a11c560d4ece30599f8db150b7a50d2286d997d3 Mon Sep 17 00:00:00 2001 From: Hannes Greule Date: Mon, 18 Nov 2024 18:44:00 +0100 Subject: [PATCH] Support 1.21.3 (#4537) * Fix Biome ABI break * Update issue template * add run-task for 1.21.3 --- .github/ISSUE_TEMPLATE/bug_report.yml | 1 + .../com/plotsquared/bukkit/generator/BukkitPlotGenerator.java | 4 ++-- build.gradle.kts | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0f84e584e..cedd4344f 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -27,6 +27,7 @@ body: description: Which server version are you using? If your server version is not listed, it is not supported. Update to a supported version first. multiple: false options: + - '1.21.3' - '1.21.1' - '1.20.6' - '1.20.4' diff --git a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java index bfccaeb3d..f713ed350 100644 --- a/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java +++ b/Bukkit/src/main/java/com/plotsquared/bukkit/generator/BukkitPlotGenerator.java @@ -52,7 +52,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Arrays; -import java.util.EnumSet; +import java.util.HashSet; import java.util.List; import java.util.Random; import java.util.Set; @@ -445,7 +445,7 @@ public class BukkitPlotGenerator extends ChunkGenerator implements GeneratorWrap private static final List BIOMES; static { - Set disabledBiomes = EnumSet.of(Biome.CUSTOM); + Set disabledBiomes = new HashSet<>(List.of(Biome.CUSTOM)); if (PlotSquared.platform().serverVersion()[1] <= 19) { final Biome cherryGrove = Registry.BIOME.get(NamespacedKey.minecraft("cherry_grove")); if (cherryGrove != null) { diff --git a/build.gradle.kts b/build.gradle.kts index 61e41ae93..1d857d51c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -230,7 +230,7 @@ tasks.getByName("jar") { enabled = false } -val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1") +val supportedVersions = listOf("1.18.2", "1.19.4", "1.20.6", "1.21.1", "1.21.3") tasks { register("cacheLatestFaweArtifact") { val lastSuccessfulBuildUrl = uri("https://ci.athion.net/job/FastAsyncWorldEdit/lastSuccessfulBuild/api/json").toURL()