From 941ec098c19c09310177a4864defdf932286a70b Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sat, 15 Nov 2025 23:18:32 -0500 Subject: [PATCH 1/9] Update to Minecraft 25w46a --- .../java/com/earth2me/essentials/utils/VersionUtil.java | 4 ++-- README.md | 2 +- .../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +- settings.gradle.kts | 6 ++++++ 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index 0b353eca414..af71e42e576 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -43,9 +43,9 @@ public final class VersionUtil { public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT"); - public static final BukkitVersion v1_21_10_R01 = BukkitVersion.fromString("1.21.10-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("25w46a-R0.1-SNAPSHOT"); - private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_10_R01); + private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01); public static final boolean PRE_FLATTENING = VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01); diff --git a/README.md b/README.md index c03cb7f8e5a..1266ffbf005 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ however, have some new requirements: * **EssentialsX requires CraftBukkit, Spigot or Paper to run.** Other server software may work, but these are not tested by the team and we may not be able to help with any issues that occur. * **EssentialsX currently supports Minecraft versions 1.8.8, 1.9.4, 1.10.2, 1.11.2, 1.12.2, 1.13.2, 1.14.4, 1.15.2, - 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.10.** + 1.16.5, 1.17.1, 1.18.2, 1.19.4, 1.20.6, and 1.21.11.** * **EssentialsX currently requires Java 8 or higher.** We recommend using the latest Java version supported by your server software. * **EssentialsX requires [Vault](http://dev.bukkit.org/bukkit-plugins/vault/) to enable using chat prefix/suffixes and diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts index 474b30f1b8d..3e52bd11a95 100644 --- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts @@ -10,7 +10,7 @@ plugins { val baseExtension = extensions.create("essentials", project) val checkstyleVersion = "8.36.2" -val paperVersion = "1.21.10-R0.1-SNAPSHOT" +val paperVersion = "25w46a-R0.1-SNAPSHOT" val paperTestVersion = "1.21.8-R0.1-SNAPSHOT" val junit5Version = "5.12.2" val junitPlatformVersion = "1.12.2" diff --git a/settings.gradle.kts b/settings.gradle.kts index 1b431277a4b..14f8b050a71 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,5 +1,11 @@ dependencyResolutionManagement { repositories { + maven("https://maven-prs.papermc.io/Paper/pr13194") { + name = "Maven for PR #13194" // https://github.com/PaperMC/Paper/pull/13194 + mavenContent { + includeModule("io.papermc.paper", "paper-api") + } + } maven("https://repo.papermc.io/repository/maven-public/") maven("https://hub.spigotmc.org/nexus/content/groups/public/") { content { From d7ac92e6fd7c1044f8f9e62b0731e37a054d2669 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 16 Nov 2025 00:14:25 -0500 Subject: [PATCH 2/9] Add netherite horse armor --- Essentials/src/main/java/com/earth2me/essentials/MobData.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Essentials/src/main/java/com/earth2me/essentials/MobData.java b/Essentials/src/main/java/com/earth2me/essentials/MobData.java index 808a0ff24ff..7aff8f155fe 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/MobData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/MobData.java @@ -82,6 +82,7 @@ public enum MobData { SADDLE_HORSE("saddle", EntityType.HORSE, Data.HORSESADDLE, true), GOLD_ARMOR_HORSE("goldarmor", EntityType.HORSE, EnumUtil.getMaterial("GOLDEN_HORSE_ARMOR", "GOLD_BARDING"), true), DIAMOND_ARMOR_HORSE("diamondarmor", EntityType.HORSE, EnumUtil.getMaterial("DIAMOND_HORSE_ARMOR", "DIAMOND_BARDING"), true), + NETHERITE_HORSE_ARMOR("netheritearmor", EntityType.HORSE, EnumUtil.getMaterial("NETHERITE_HORSE_ARMOR"), true), ARMOR_HORSE("armor", EntityType.HORSE, EnumUtil.getMaterial("IRON_HORSE_ARMOR", "IRON_BARDING"), true), SIAMESE_CAT("siamese", MobCompat.CAT, MobCompat.CatType.SIAMESE, true), WHITE_CAT("white", MobCompat.CAT, MobCompat.CatType.WHITE, false), From e4552cb48cb370bb8bf1ab194b1d2fdfcd1b971e Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 16 Nov 2025 00:34:06 -0500 Subject: [PATCH 3/9] Add 1.21.11 Mobs --- .../java/com/earth2me/essentials/Mob.java | 4 +++ .../com/earth2me/essentials/MobCompat.java | 29 +++++++++++++++++++ .../java/com/earth2me/essentials/MobData.java | 17 +++++++++++ 3 files changed, 50 insertions(+) diff --git a/Essentials/src/main/java/com/earth2me/essentials/Mob.java b/Essentials/src/main/java/com/earth2me/essentials/Mob.java index 4ca40a1ee03..61486003d7d 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Mob.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Mob.java @@ -127,6 +127,10 @@ public enum Mob { CREAKING("Creaking", Enemies.ENEMY, "CREAKING"), HAPPY_GHAST("HappyGhast", Enemies.FRIENDLY, "HAPPY_GHAST"), COPPER_GOLEM("CopperGolem", Enemies.FRIENDLY, "COPPER_GOLEM"), + CAMEL_HUSK("CamelHusk", Enemies.NEUTRAL, "CAMEL_HUSK"), + NAUTILUS("Nautilus", Enemies.NEUTRAL, "NAUTILUS"), + ZOMBIE_NAUTILUS("ZombieNautilus", Enemies.NEUTRAL, "ZOMBIE_NAUTILUS"), + PARCHED("Parched", Enemies.ENEMY, "PARCHED"), ; private static final Map hashMap = new HashMap<>(); diff --git a/Essentials/src/main/java/com/earth2me/essentials/MobCompat.java b/Essentials/src/main/java/com/earth2me/essentials/MobCompat.java index 6085fb19c6a..74ff85a4716 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/MobCompat.java +++ b/Essentials/src/main/java/com/earth2me/essentials/MobCompat.java @@ -6,6 +6,7 @@ import net.ess3.nms.refl.ReflUtil; import org.bukkit.Material; import org.bukkit.TreeSpecies; +import org.bukkit.entity.AbstractNautilus; import org.bukkit.entity.Axolotl; import org.bukkit.entity.Boat; import org.bukkit.entity.Camel; @@ -26,6 +27,7 @@ import org.bukkit.entity.TropicalFish; import org.bukkit.entity.Villager; import org.bukkit.entity.Wolf; +import org.bukkit.entity.ZombieNautilus; import org.bukkit.inventory.ItemStack; import java.lang.invoke.MethodHandle; @@ -69,6 +71,9 @@ public final class MobCompat { public static final EntityType FROG = getEntityType("FROG"); public static final EntityType CAMEL = getEntityType("CAMEL"); public static final EntityType SALMON = getEntityType("SALMON"); + public static final EntityType CAMEL_HUSK = getEntityType("CAMEL_HUSK"); + public static final EntityType NAUTILUS = getEntityType("NAUTILUS"); + public static final EntityType ZOMBIE_NAUTILUS = getEntityType("ZOMBIE_NAUTILUS"); // Constants for mobs that have changed since earlier versions public static final EntityType CAT = getEntityType("CAT", "OCELOT"); @@ -304,6 +309,30 @@ public static void setPigVariant(final Entity spawned, final String variant) { } } + public static void setZombieNautilusVariant(final Entity spawned, final String variant) { + if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_21_11_R01)) { + return; + } + + if (spawned instanceof ZombieNautilus) { + //noinspection DataFlowIssue + ((ZombieNautilus) spawned).setVariant(RegistryUtil.valueOf(ZombieNautilus.Variant.class, variant)); + } + } + + public static void setNautilusSaddle(final Entity entity, final Player target) { + if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_21_11_R01)) { + return; + } + + if (entity instanceof AbstractNautilus) { + final AbstractNautilus nautilus = (AbstractNautilus) entity; + nautilus.setTamed(true); + nautilus.setOwner(target); + nautilus.getInventory().setSaddle(new ItemStack(Material.SADDLE, 1)); + } + } + public enum CatType { // These are (loosely) Mojang names for the cats SIAMESE("SIAMESE", "SIAMESE_CAT"), diff --git a/Essentials/src/main/java/com/earth2me/essentials/MobData.java b/Essentials/src/main/java/com/earth2me/essentials/MobData.java index 7aff8f155fe..9632df85717 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/MobData.java +++ b/Essentials/src/main/java/com/earth2me/essentials/MobData.java @@ -232,6 +232,11 @@ public enum MobData { TEMPERATE_PIG("temperate", Pig.class, "pig:TEMPERATE", true), WARM_PIG("warm", Pig.class, "pig:WARM", true), COLD_PIG("cold", Pig.class, "pig:COLD", true), + SADDLE_CAMEL_HUSK("saddle", MobCompat.CAMEL_HUSK, Data.CAMELHUSKSADDLE, true), + TEMPERATE_ZOMBIE_NAUTILUS("temperate", MobCompat.ZOMBIE_NAUTILUS, "zombienautilus:TEMPERATE", true), + WARM_ZOMBIE_NAUTILUS("warm", MobCompat.ZOMBIE_NAUTILUS, "zombienautilus:WARM", true), + SADDLE_NAUTILUS("saddle", MobCompat.NAUTILUS, Data.NAUTILUSSADDLE, true), + SADDLE_ZOMBIE_NAUTILUS("saddle", MobCompat.ZOMBIE_NAUTILUS, Data.NAUTILUSSADDLE, true) ; final private String nickname; @@ -412,6 +417,12 @@ public void setData(final Entity spawned, final Player target, final String rawD ((Goat) spawned).setScreaming(true); } else if (this.value.equals(Data.CAMELSADDLE)) { MobCompat.setCamelSaddle(spawned, target); + } else if (this.value.equals(Data.CAMELHUSKSADDLE)) { + MobCompat.setCamelSaddle(spawned, target); + } else if (this.value.equals(Data.NAUTILUSSADDLE)) { + MobCompat.setNautilusSaddle(spawned, target); + } else if (this.value.equals(Data.ZOMBIENAUTILUSSADDLE)) { + MobCompat.setNautilusSaddle(spawned, target); } else if (this.value instanceof MobCompat.BoatVariant) { MobCompat.setBoatVariant(spawned, (MobCompat.BoatVariant) this.value); } else if (this.value instanceof String) { @@ -462,6 +473,9 @@ public void setData(final Entity spawned, final Player target, final String rawD case "pig": MobCompat.setPigVariant(spawned, split[1]); break; + case "zombienautilus": + MobCompat.setZombieNautilusVariant(spawned, split[1]); + break; } } else { Essentials.getWrappedLogger().warning("Unknown mob data type: " + this.toString()); @@ -487,5 +501,8 @@ public enum Data { FISH_PATTERN_COLOR, GOAT_SCREAMING, CAMELSADDLE, + CAMELHUSKSADDLE, + NAUTILUSSADDLE, + ZOMBIENAUTILUSSADDLE, } } From 91fec53db221ba6e7430080fd680869fa702d397 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 16 Nov 2025 00:37:08 -0500 Subject: [PATCH 4/9] Add 1.21.11 Potions --- .../src/main/java/com/earth2me/essentials/Potions.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Essentials/src/main/java/com/earth2me/essentials/Potions.java b/Essentials/src/main/java/com/earth2me/essentials/Potions.java index c6b8ae4ae01..c9a0927a10b 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/Potions.java +++ b/Essentials/src/main/java/com/earth2me/essentials/Potions.java @@ -161,6 +161,14 @@ public final class Potions { ALIASPOTIONS.put("wind", PotionEffectType.WIND_CHARGED); } catch (final Throwable ignored) { } + + // 1.21.11 + try { + POTIONS.put("breathofthenautilus", PotionEffectType.BREATH_OF_THE_NAUTILUS); + ALIASPOTIONS.put("nautilusbreath", PotionEffectType.BREATH_OF_THE_NAUTILUS); + ALIASPOTIONS.put("nautilus", PotionEffectType.BREATH_OF_THE_NAUTILUS); + } catch (final Throwable ignored) { + } } private Potions() { From 541e757e91b3e25388b24e7c1702f14cea323ae4 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sat, 22 Nov 2025 16:40:35 -0500 Subject: [PATCH 5/9] Bump to 1.21.11-pre1 --- .../main/java/com/earth2me/essentials/utils/VersionUtil.java | 2 +- .../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index af71e42e576..e99a09df4e8 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -43,7 +43,7 @@ public final class VersionUtil { public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT"); - public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("25w46a-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-pre1-R0.1-SNAPSHOT"); private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01); diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts index 3e52bd11a95..536a5e43905 100644 --- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts @@ -10,7 +10,7 @@ plugins { val baseExtension = extensions.create("essentials", project) val checkstyleVersion = "8.36.2" -val paperVersion = "25w46a-R0.1-SNAPSHOT" +val paperVersion = "1.21.11-pre1-R0.1-SNAPSHOT" val paperTestVersion = "1.21.8-R0.1-SNAPSHOT" val junit5Version = "5.12.2" val junitPlatformVersion = "1.12.2" From 95ab68ecf3a502c27bbdf52c2b0029b585c9c29a Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sat, 22 Nov 2025 23:59:42 -0500 Subject: [PATCH 6/9] 1.21.11 Items --- Essentials/src/main/resources/items.json | 351 ++++++++++++++++++++++- 1 file changed, 339 insertions(+), 12 deletions(-) diff --git a/Essentials/src/main/resources/items.json b/Essentials/src/main/resources/items.json index 9432c598a7f..2c0727b6cc2 100644 --- a/Essentials/src/main/resources/items.json +++ b/Essentials/src/main/resources/items.json @@ -2594,6 +2594,63 @@ "calibratedsculksensor": "calibrated_sculk_sensor", "cscsensor": "calibrated_sculk_sensor", "minecraft:calibrated_sculk_sensor": "calibrated_sculk_sensor", + "camel_husk_spawn_egg": { + "material": "CAMEL_HUSK_SPAWN_EGG" + }, + "camelhuskspawnegg": "camel_husk_spawn_egg", + "egghusk": "husk_spawn_egg", + "huskegg": "husk_spawn_egg", + "husksegg": "husk_spawn_egg", + "huskspawn": "husk_spawn_egg", + "huskspawnegg": "husk_spawn_egg", + "minecraft:camel_husk_spawn_egg": "camel_husk_spawn_egg", + "segghusk": "husk_spawn_egg", + "spawnegghusk": "husk_spawn_egg", + "spawnhusk": "husk_spawn_egg", + "camel_husk_spawner": { + "entity": "CAMEL_HUSK", + "material": "SPAWNER" + }, + "camel_huskcage": "camel_husk_spawner", + "camel_huskmcage": "camel_husk_spawner", + "camel_huskmobcage": "camel_husk_spawner", + "camel_huskmobspawner": "camel_husk_spawner", + "camel_huskmonstercage": "camel_husk_spawner", + "camel_huskmonsterspawner": "camel_husk_spawner", + "camel_huskmspawner": "camel_husk_spawner", + "camel_huskspawner": "camel_husk_spawner", + "camelhuskcage": "camel_husk_spawner", + "camelhuskmcage": "camel_husk_spawner", + "camelhuskmobcage": "camel_husk_spawner", + "camelhuskmobspawner": "camel_husk_spawner", + "camelhuskmonstercage": "camel_husk_spawner", + "camelhuskmonsterspawner": "camel_husk_spawner", + "camelhuskmspawner": "camel_husk_spawner", + "camelhuskspawner": "camel_husk_spawner", + "chuskcage": "camel_husk_spawner", + "chuskmcage": "camel_husk_spawner", + "chuskmobcage": "camel_husk_spawner", + "chuskmobspawner": "camel_husk_spawner", + "chuskmonstercage": "camel_husk_spawner", + "chuskmonsterspawner": "camel_husk_spawner", + "chuskmspawner": "camel_husk_spawner", + "chuskspawner": "camel_husk_spawner", + "dcamelcage": "camel_husk_spawner", + "dcamelmcage": "camel_husk_spawner", + "dcamelmobcage": "camel_husk_spawner", + "dcamelmobspawner": "camel_husk_spawner", + "dcamelmonstercage": "camel_husk_spawner", + "dcamelmonsterspawner": "camel_husk_spawner", + "dcamelmspawner": "camel_husk_spawner", + "dcamelspawner": "camel_husk_spawner", + "deadcamelcage": "camel_husk_spawner", + "deadcamelmcage": "camel_husk_spawner", + "deadcamelmobcage": "camel_husk_spawner", + "deadcamelmobspawner": "camel_husk_spawner", + "deadcamelmonstercage": "camel_husk_spawner", + "deadcamelmonsterspawner": "camel_husk_spawner", + "deadcamelmspawner": "camel_husk_spawner", + "deadcamelspawner": "camel_husk_spawner", "camel_spawn_egg": { "material": "CAMEL_SPAWN_EGG" }, @@ -4686,6 +4743,19 @@ "copplegs": "copper_leggings", "copppants": "copper_leggings", "minecraft:copper_leggings": "copper_leggings", + "copper_nautilus_armor": { + "material": "COPPER_NAUTILUS_ARMOR" + }, + "copnarmor": "copper_nautilus_armor", + "copnautarmor": "copper_nautilus_armor", + "copnautilusarmor": "copper_nautilus_armor", + "coppernarmor": "copper_nautilus_armor", + "coppernautarmor": "copper_nautilus_armor", + "coppernautilusarmor": "copper_nautilus_armor", + "coppnarmor": "copper_nautilus_armor", + "coppnautarmor": "copper_nautilus_armor", + "coppnautilusarmor": "copper_nautilus_armor", + "minecraft:copper_nautilus_armor": "copper_nautilus_armor", "copper_nugget": { "material": "COPPER_NUGGET" }, @@ -4735,6 +4805,13 @@ "copshovel": "copper_shovel", "copspade": "copper_shovel", "minecraft:copper_shovel": "copper_shovel", + "copper_spear": { + "material": "COPPER_SPEAR" + }, + "copperspear": "copper_spear", + "coppspear": "copper_spear", + "copspear": "copper_spear", + "minecraft:copper_spear": "copper_spear", "copper_sword": { "material": "COPPER_SWORD" }, @@ -6588,6 +6665,19 @@ "dlegs": "diamond_leggings", "dpants": "diamond_leggings", "minecraft:diamond_leggings": "diamond_leggings", + "diamond_nautilus_armor": { + "material": "DIAMOND_NAUTILUS_ARMOR" + }, + "crystalnarmor": "diamond_nautilus_armor", + "crystalnautarmor": "diamond_nautilus_armor", + "crystalnautilusarmor": "diamond_nautilus_armor", + "diamondnarmor": "diamond_nautilus_armor", + "diamondnautarmor": "diamond_nautilus_armor", + "diamondnautilusarmor": "diamond_nautilus_armor", + "dnarmor": "diamond_nautilus_armor", + "dnautarmor": "diamond_nautilus_armor", + "dnautilusarmor": "diamond_nautilus_armor", + "minecraft:diamond_nautilus_armor": "diamond_nautilus_armor", "diamond_ore": { "material": "DIAMOND_ORE" }, @@ -6627,6 +6717,13 @@ "dshovel": "diamond_shovel", "dspade": "diamond_shovel", "minecraft:diamond_shovel": "diamond_shovel", + "diamond_spear": { + "material": "DIAMOND_SPEAR" + }, + "crystalspear": "diamond_spear", + "diamondspear": "diamond_spear", + "dspear": "diamond_spear", + "minecraft:diamond_spear": "diamond_spear", "diamond_sword": { "material": "DIAMOND_SWORD" }, @@ -8534,6 +8631,17 @@ "goldpants": "golden_leggings", "gpants": "golden_leggings", "minecraft:golden_leggings": "golden_leggings", + "golden_nautilus_armor": { + "material": "GOLDEN_NAUTILUS_ARMOR" + }, + "gnarmor": "golden_nautilus_armor", + "gnautarmor": "golden_nautilus_armor", + "gnautilusarmor": "golden_nautilus_armor", + "goldennautilusarmor": "golden_nautilus_armor", + "goldnarmor": "golden_nautilus_armor", + "goldnautarmor": "golden_nautilus_armor", + "goldnautilusarmor": "golden_nautilus_armor", + "minecraft:golden_nautilus_armor": "golden_nautilus_armor", "golden_pickaxe": { "material": "GOLDEN_PICKAXE" }, @@ -8552,6 +8660,13 @@ "gshovel": "golden_shovel", "gspade": "golden_shovel", "minecraft:golden_shovel": "golden_shovel", + "golden_spear": { + "material": "GOLDEN_SPEAR" + }, + "goldenspear": "golden_spear", + "goldspear": "golden_spear", + "gspear": "golden_spear", + "minecraft:golden_spear": "golden_spear", "golden_sword": { "material": "GOLDEN_SWORD" }, @@ -10025,15 +10140,7 @@ "husk_spawn_egg": { "material": "HUSK_SPAWN_EGG" }, - "egghusk": "husk_spawn_egg", - "huskegg": "husk_spawn_egg", - "husksegg": "husk_spawn_egg", - "huskspawn": "husk_spawn_egg", - "huskspawnegg": "husk_spawn_egg", "minecraft:husk_spawn_egg": "husk_spawn_egg", - "segghusk": "husk_spawn_egg", - "spawnegghusk": "husk_spawn_egg", - "spawnhusk": "husk_spawn_egg", "husk_spawner": { "entity": "HUSK", "material": "SPAWNER" @@ -11412,6 +11519,25 @@ "stleggings": "iron_leggings", "stlegs": "iron_leggings", "stpants": "iron_leggings", + "iron_nautilus_armor": { + "material": "IRON_NAUTILUS_ARMOR" + }, + "inarmor": "iron_nautilus_armor", + "inautarmor": "iron_nautilus_armor", + "inautilusarmor": "iron_nautilus_armor", + "ironnarmor": "iron_nautilus_armor", + "ironnautarmor": "iron_nautilus_armor", + "ironnautilusarmor": "iron_nautilus_armor", + "minecraft:iron_nautilus_armor": "iron_nautilus_armor", + "snarmor": "iron_nautilus_armor", + "snautarmor": "iron_nautilus_armor", + "snautilusarmor": "iron_nautilus_armor", + "steelnarmor": "iron_nautilus_armor", + "steelnautarmor": "iron_nautilus_armor", + "steelnautilusarmor": "iron_nautilus_armor", + "stnarmor": "iron_nautilus_armor", + "stnautarmor": "iron_nautilus_armor", + "stnautilusarmor": "iron_nautilus_armor", "iron_nugget": { "material": "IRON_NUGGET" }, @@ -11483,6 +11609,15 @@ "steelspade": "iron_shovel", "stshovel": "iron_shovel", "stspade": "iron_shovel", + "iron_spear": { + "material": "IRON_SPEAR" + }, + "ironspear": "iron_spear", + "ispear": "iron_spear", + "minecraft:iron_spear": "iron_spear", + "sspear": "stone_spear", + "steelspear": "iron_spear", + "stspear": "iron_spear", "iron_sword": { "material": "IRON_SWORD" }, @@ -23022,6 +23157,46 @@ }, "minecraft:nautilus_shell": "nautilus_shell", "nautilusshell": "nautilus_shell", + "nautilus_spawn_egg": { + "material": "NAUTILUS_SPAWN_EGG" + }, + "eggnaut": "nautilus_spawn_egg", + "eggnautilus": "nautilus_spawn_egg", + "minecraft:nautilus_spawn_egg": "nautilus_spawn_egg", + "nautegg": "nautilus_spawn_egg", + "nautilusegg": "nautilus_spawn_egg", + "nautilussegg": "nautilus_spawn_egg", + "nautilusspawn": "nautilus_spawn_egg", + "nautilusspawnegg": "nautilus_spawn_egg", + "nautsegg": "nautilus_spawn_egg", + "nautspawn": "nautilus_spawn_egg", + "nautspawnegg": "nautilus_spawn_egg", + "seggnaut": "nautilus_spawn_egg", + "seggnautilus": "nautilus_spawn_egg", + "spawneggnaut": "nautilus_spawn_egg", + "spawneggnautilus": "nautilus_spawn_egg", + "spawnnaut": "nautilus_spawn_egg", + "spawnnautilus": "nautilus_spawn_egg", + "nautilus_spawner": { + "entity": "NAUTILUS", + "material": "SPAWNER" + }, + "nautcage": "nautilus_spawner", + "nautiluscage": "nautilus_spawner", + "nautilusmcage": "nautilus_spawner", + "nautilusmobcage": "nautilus_spawner", + "nautilusmobspawner": "nautilus_spawner", + "nautilusmonstercage": "nautilus_spawner", + "nautilusmonsterspawner": "nautilus_spawner", + "nautilusmspawner": "nautilus_spawner", + "nautilusspawner": "nautilus_spawner", + "nautmcage": "nautilus_spawner", + "nautmobcage": "nautilus_spawner", + "nautmobspawner": "nautilus_spawner", + "nautmonstercage": "nautilus_spawner", + "nautmonsterspawner": "nautilus_spawner", + "nautmspawner": "nautilus_spawner", + "nautspawner": "nautilus_spawner", "nether_brick": { "material": "NETHER_BRICK" }, @@ -23297,6 +23472,22 @@ "netherhoe": "netherite_hoe", "netheritehoe": "netherite_hoe", "nethhoe": "netherite_hoe", + "netherite_horse_armor": { + "material": "NETHERITE_HORSE_ARMOR" + }, + "hellarmor": "netherite_horse_armor", + "hellharmor": "netherite_horse_armor", + "hellhorsearmor": "netherite_horse_armor", + "minecraft:netherite_horse_armor": "netherite_horse_armor", + "netharmor": "netherite_horse_armor", + "netherarmor": "netherite_horse_armor", + "netherharmor": "netherite_horse_armor", + "netherhorsearmor": "netherite_horse_armor", + "netheritearmor": "netherite_horse_armor", + "netheriteharmor": "netherite_horse_armor", + "netheritehorsearmor": "netherite_horse_armor", + "nethharmor": "netherite_horse_armor", + "nethhorsearmor": "netherite_horse_armor", "netherite_ingot": { "material": "NETHERITE_INGOT" }, @@ -23341,6 +23532,22 @@ "nethleggings": "netherite_leggings", "nethlegs": "netherite_leggings", "nethpants": "netherite_leggings", + "netherite_nautilus_armor": { + "material": "NETHERITE_NAUTILUS_ARMOR" + }, + "hellnarmor": "netherite_nautilus_armor", + "hellnautarmor": "netherite_nautilus_armor", + "hellnautilusarmor": "netherite_nautilus_armor", + "minecraft:netherite_nautilus_armor": "netherite_nautilus_armor", + "netheritenarmor": "netherite_nautilus_armor", + "netheritenautarmor": "netherite_nautilus_armor", + "netheritenautilusarmor": "netherite_nautilus_armor", + "nethernarmor": "netherite_nautilus_armor", + "nethernautarmor": "netherite_nautilus_armor", + "nethernautilusarmor": "netherite_nautilus_armor", + "nethnarmor": "netherite_nautilus_armor", + "nethnautarmor": "netherite_nautilus_armor", + "nethnautilusarmor": "netherite_nautilus_armor", "netherite_pickaxe": { "material": "NETHERITE_PICKAXE" }, @@ -23373,6 +23580,14 @@ "netherspade": "netherite_shovel", "nethshovel": "netherite_shovel", "nethspade": "netherite_shovel", + "netherite_spear": { + "material": "NETHERITE_SPEAR" + }, + "hellspear": "netherite_spear", + "minecraft:netherite_spear": "netherite_spear", + "netheritespear": "netherite_spear", + "netherspear": "netherite_spear", + "nethspear": "netherite_spear", "netherite_sword": { "material": "NETHERITE_SWORD" }, @@ -25415,6 +25630,46 @@ "material": "PAPER" }, "minecraft:paper": "paper", + "parched_spawn_egg": { + "material": "PARCHED_SPAWN_EGG" + }, + "eggparch": "parched_spawn_egg", + "eggparched": "parched_spawn_egg", + "minecraft:parched_spawn_egg": "parched_spawn_egg", + "parchedegg": "parched_spawn_egg", + "parchedsegg": "parched_spawn_egg", + "parchedspawn": "parched_spawn_egg", + "parchedspawnegg": "parched_spawn_egg", + "parchegg": "parched_spawn_egg", + "parchsegg": "parched_spawn_egg", + "parchspawn": "parched_spawn_egg", + "parchspawnegg": "parched_spawn_egg", + "seggparch": "parched_spawn_egg", + "seggparched": "parched_spawn_egg", + "spawneggparch": "parched_spawn_egg", + "spawneggparched": "parched_spawn_egg", + "spawnparch": "parched_spawn_egg", + "spawnparched": "parched_spawn_egg", + "parched_spawner": { + "entity": "PARCHED", + "material": "SPAWNER" + }, + "parchcage": "parched_spawner", + "parchedcage": "parched_spawner", + "parchedmcage": "parched_spawner", + "parchedmobcage": "parched_spawner", + "parchedmobspawner": "parched_spawner", + "parchedmonstercage": "parched_spawner", + "parchedmonsterspawner": "parched_spawner", + "parchedmspawner": "parched_spawner", + "parchedspawner": "parched_spawner", + "parchmcage": "parched_spawner", + "parchmobcage": "parched_spawner", + "parchmobspawner": "parched_spawner", + "parchmonstercage": "parched_spawner", + "parchmonsterspawner": "parched_spawner", + "parchmspawner": "parched_spawner", + "parchspawner": "parched_spawner", "parrot_spawn_egg": { "material": "PARROT_SPAWN_EGG" }, @@ -30041,6 +30296,14 @@ }, "minecraft:stone_slab": "stone_slab", "stoneslab": "stone_slab", + "stone_spear": { + "material": "STONE_SPEAR" + }, + "cobblestonespear": "stone_spear", + "csspear": "stone_spear", + "cstonespear": "stone_spear", + "minecraft:stone_spear": "stone_spear", + "stonespear": "stone_spear", "stone_stairs": { "material": "STONE_STAIRS" }, @@ -49916,6 +50179,13 @@ "woodspade": "wooden_shovel", "wshovel": "wooden_shovel", "wspade": "wooden_shovel", + "wooden_spear": { + "material": "WOODEN_SPEAR" + }, + "minecraft:wooden_spear": "wooden_spear", + "woodenspear": "wooden_spear", + "woodspear": "wooden_spear", + "wspear": "wooden_spear", "wooden_sword": { "material": "WOODEN_SWORD" }, @@ -50240,13 +50510,13 @@ "zombie_horsemonsterspawner": "zombie_horse_spawner", "zombie_horsemspawner": "zombie_horse_spawner", "zombie_horsespawner": "zombie_horse_spawner", - "zombie_spawn_egg": { - "material": "ZOMBIE_SPAWN_EGG" + "zombie_nautilus_spawn_egg": { + "material": "ZOMBIE_NAUTILUS_SPAWN_EGG" }, "eggz": "zombie_spawn_egg", "eggzomb": "zombie_spawn_egg", "eggzombie": "zombie_spawn_egg", - "minecraft:zombie_spawn_egg": "zombie_spawn_egg", + "minecraft:zombie_nautilus_spawn_egg": "zombie_nautilus_spawn_egg", "seggz": "zombie_spawn_egg", "seggzomb": "zombie_spawn_egg", "seggzombie": "zombie_spawn_egg", @@ -50259,6 +50529,7 @@ "zegg": "zombie_spawn_egg", "zombegg": "zombie_spawn_egg", "zombieegg": "zombie_spawn_egg", + "zombienautilusspawnegg": "zombie_nautilus_spawn_egg", "zombiesegg": "zombie_spawn_egg", "zombiespawn": "zombie_spawn_egg", "zombiespawnegg": "zombie_spawn_egg", @@ -50268,6 +50539,62 @@ "zsegg": "zombie_spawn_egg", "zspawn": "zombie_spawn_egg", "zspawnegg": "zombie_spawn_egg", + "zombie_nautilus_spawner": { + "entity": "ZOMBIE_NAUTILUS", + "material": "SPAWNER" + }, + "znautcage": "zombie_nautilus_spawner", + "znautiluscage": "zombie_nautilus_spawner", + "znautilusmcage": "zombie_nautilus_spawner", + "znautilusmobcage": "zombie_nautilus_spawner", + "znautilusmobspawner": "zombie_nautilus_spawner", + "znautilusmonstercage": "zombie_nautilus_spawner", + "znautilusmonsterspawner": "zombie_nautilus_spawner", + "znautilusmspawner": "zombie_nautilus_spawner", + "znautilusspawner": "zombie_nautilus_spawner", + "znautmcage": "zombie_nautilus_spawner", + "znautmobcage": "zombie_nautilus_spawner", + "znautmobspawner": "zombie_nautilus_spawner", + "znautmonstercage": "zombie_nautilus_spawner", + "znautmonsterspawner": "zombie_nautilus_spawner", + "znautmspawner": "zombie_nautilus_spawner", + "znautspawner": "zombie_nautilus_spawner", + "zombie_nautiluscage": "zombie_nautilus_spawner", + "zombie_nautilusmcage": "zombie_nautilus_spawner", + "zombie_nautilusmobcage": "zombie_nautilus_spawner", + "zombie_nautilusmobspawner": "zombie_nautilus_spawner", + "zombie_nautilusmonstercage": "zombie_nautilus_spawner", + "zombie_nautilusmonsterspawner": "zombie_nautilus_spawner", + "zombie_nautilusmspawner": "zombie_nautilus_spawner", + "zombie_nautilusspawner": "zombie_nautilus_spawner", + "zombienautiluscage": "zombie_nautilus_spawner", + "zombienautilusmcage": "zombie_nautilus_spawner", + "zombienautilusmobcage": "zombie_nautilus_spawner", + "zombienautilusmobspawner": "zombie_nautilus_spawner", + "zombienautilusmonstercage": "zombie_nautilus_spawner", + "zombienautilusmonsterspawner": "zombie_nautilus_spawner", + "zombienautilusmspawner": "zombie_nautilus_spawner", + "zombienautilusspawner": "zombie_nautilus_spawner", + "zombnautcage": "zombie_nautilus_spawner", + "zombnautiluscage": "zombie_nautilus_spawner", + "zombnautilusmcage": "zombie_nautilus_spawner", + "zombnautilusmobcage": "zombie_nautilus_spawner", + "zombnautilusmobspawner": "zombie_nautilus_spawner", + "zombnautilusmonstercage": "zombie_nautilus_spawner", + "zombnautilusmonsterspawner": "zombie_nautilus_spawner", + "zombnautilusmspawner": "zombie_nautilus_spawner", + "zombnautilusspawner": "zombie_nautilus_spawner", + "zombnautmcage": "zombie_nautilus_spawner", + "zombnautmobcage": "zombie_nautilus_spawner", + "zombnautmobspawner": "zombie_nautilus_spawner", + "zombnautmonstercage": "zombie_nautilus_spawner", + "zombnautmonsterspawner": "zombie_nautilus_spawner", + "zombnautmspawner": "zombie_nautilus_spawner", + "zombnautspawner": "zombie_nautilus_spawner", + "zombie_spawn_egg": { + "material": "ZOMBIE_SPAWN_EGG" + }, + "minecraft:zombie_spawn_egg": "zombie_spawn_egg", "zombie_spawner": { "entity": "ZOMBIE", "material": "SPAWNER" @@ -50614,4 +50941,4 @@ "zpmanmonsterspawner": "zombified_piglin_spawner", "zpmanmspawner": "zombified_piglin_spawner", "zpmanspawner": "zombified_piglin_spawner" -} \ No newline at end of file +} From 6bab59f60ac86c1917ec33543369d98a1c61a8b5 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Sun, 7 Dec 2025 10:49:43 -0800 Subject: [PATCH 7/9] Bump to rc2 --- .../main/java/com/earth2me/essentials/utils/VersionUtil.java | 2 +- .../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index e99a09df4e8..e2206cfd082 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -43,7 +43,7 @@ public final class VersionUtil { public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT"); - public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-pre1-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-rc2-R0.1-SNAPSHOT"); private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01); diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts index 536a5e43905..60b04197b40 100644 --- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts @@ -10,7 +10,7 @@ plugins { val baseExtension = extensions.create("essentials", project) val checkstyleVersion = "8.36.2" -val paperVersion = "1.21.11-pre1-R0.1-SNAPSHOT" +val paperVersion = "1.21.11-rc2-R0.1-SNAPSHOT" val paperTestVersion = "1.21.8-R0.1-SNAPSHOT" val junit5Version = "5.12.2" val junitPlatformVersion = "1.12.2" From 10150e03c6e087806af18566c12baa1ee2d881dc Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Tue, 9 Dec 2025 07:00:20 -0800 Subject: [PATCH 8/9] Fix camel husk aliases --- Essentials/src/main/resources/items.json | 57 ++++++++++++++++++++---- 1 file changed, 48 insertions(+), 9 deletions(-) diff --git a/Essentials/src/main/resources/items.json b/Essentials/src/main/resources/items.json index 2c0727b6cc2..c6a31fd7597 100644 --- a/Essentials/src/main/resources/items.json +++ b/Essentials/src/main/resources/items.json @@ -2597,16 +2597,47 @@ "camel_husk_spawn_egg": { "material": "CAMEL_HUSK_SPAWN_EGG" }, + "camel_huskegg": "camel_husk_spawn_egg", + "camel_husksegg": "camel_husk_spawn_egg", + "camel_huskspawn": "camel_husk_spawn_egg", + "camel_huskspawnegg": "camel_husk_spawn_egg", + "camelhuskegg": "camel_husk_spawn_egg", + "camelhusksegg": "camel_husk_spawn_egg", + "camelhuskspawn": "camel_husk_spawn_egg", "camelhuskspawnegg": "camel_husk_spawn_egg", - "egghusk": "husk_spawn_egg", - "huskegg": "husk_spawn_egg", - "husksegg": "husk_spawn_egg", - "huskspawn": "husk_spawn_egg", - "huskspawnegg": "husk_spawn_egg", + "chuskegg": "camel_husk_spawn_egg", + "chusksegg": "camel_husk_spawn_egg", + "chuskspawn": "camel_husk_spawn_egg", + "chuskspawnegg": "camel_husk_spawn_egg", + "dcamelegg": "camel_husk_spawn_egg", + "dcamelsegg": "camel_husk_spawn_egg", + "dcamelspawn": "camel_husk_spawn_egg", + "dcamelspawnegg": "camel_husk_spawn_egg", + "deadcamelegg": "camel_husk_spawn_egg", + "deadcamelsegg": "camel_husk_spawn_egg", + "deadcamelspawn": "camel_husk_spawn_egg", + "deadcamelspawnegg": "camel_husk_spawn_egg", + "eggcamel_husk": "camel_husk_spawn_egg", + "eggcamelhusk": "camel_husk_spawn_egg", + "eggchusk": "camel_husk_spawn_egg", + "eggdcamel": "camel_husk_spawn_egg", + "eggdeadcamel": "camel_husk_spawn_egg", "minecraft:camel_husk_spawn_egg": "camel_husk_spawn_egg", - "segghusk": "husk_spawn_egg", - "spawnegghusk": "husk_spawn_egg", - "spawnhusk": "husk_spawn_egg", + "seggcamel_husk": "camel_husk_spawn_egg", + "seggcamelhusk": "camel_husk_spawn_egg", + "seggchusk": "camel_husk_spawn_egg", + "seggdcamel": "camel_husk_spawn_egg", + "seggdeadcamel": "camel_husk_spawn_egg", + "spawncamel_husk": "camel_husk_spawn_egg", + "spawncamelhusk": "camel_husk_spawn_egg", + "spawnchusk": "camel_husk_spawn_egg", + "spawndcamel": "camel_husk_spawn_egg", + "spawndeadcamel": "camel_husk_spawn_egg", + "spawneggcamel_husk": "camel_husk_spawn_egg", + "spawneggcamelhusk": "camel_husk_spawn_egg", + "spawneggchusk": "camel_husk_spawn_egg", + "spawneggdcamel": "camel_husk_spawn_egg", + "spawneggdeadcamel": "camel_husk_spawn_egg", "camel_husk_spawner": { "entity": "CAMEL_HUSK", "material": "SPAWNER" @@ -10140,7 +10171,15 @@ "husk_spawn_egg": { "material": "HUSK_SPAWN_EGG" }, + "egghusk": "husk_spawn_egg", + "huskegg": "husk_spawn_egg", + "husksegg": "husk_spawn_egg", + "huskspawn": "husk_spawn_egg", + "huskspawnegg": "husk_spawn_egg", "minecraft:husk_spawn_egg": "husk_spawn_egg", + "segghusk": "husk_spawn_egg", + "spawnegghusk": "husk_spawn_egg", + "spawnhusk": "husk_spawn_egg", "husk_spawner": { "entity": "HUSK", "material": "SPAWNER" @@ -50941,4 +50980,4 @@ "zpmanmonsterspawner": "zombified_piglin_spawner", "zpmanmspawner": "zombified_piglin_spawner", "zpmanspawner": "zombified_piglin_spawner" -} +} \ No newline at end of file From 8ddacc70c26ae94280962faa615557f86ee7e568 Mon Sep 17 00:00:00 2001 From: JRoy <10731363+JRoy@users.noreply.github.com> Date: Tue, 9 Dec 2025 07:00:55 -0800 Subject: [PATCH 9/9] Bump to 1.21.11 --- .../main/java/com/earth2me/essentials/utils/VersionUtil.java | 2 +- .../src/main/kotlin/essentials.base-conventions.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java index e2206cfd082..b821320f891 100644 --- a/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java +++ b/Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java @@ -43,7 +43,7 @@ public final class VersionUtil { public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT"); public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT"); - public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-rc2-R0.1-SNAPSHOT"); + public static final BukkitVersion v1_21_11_R01 = BukkitVersion.fromString("1.21.11-R0.1-SNAPSHOT"); private static final Set supportedVersions = ImmutableSet.of(v1_8_8_R01, v1_9_4_R01, v1_10_2_R01, v1_11_2_R01, v1_12_2_R01, v1_13_2_R01, v1_14_4_R01, v1_15_2_R01, v1_16_5_R01, v1_17_1_R01, v1_18_2_R01, v1_19_4_R01, v1_20_6_R01, v1_21_11_R01); diff --git a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts index 60b04197b40..b338a65be18 100644 --- a/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts +++ b/build-logic/src/main/kotlin/essentials.base-conventions.gradle.kts @@ -10,7 +10,7 @@ plugins { val baseExtension = extensions.create("essentials", project) val checkstyleVersion = "8.36.2" -val paperVersion = "1.21.11-rc2-R0.1-SNAPSHOT" +val paperVersion = "1.21.11-R0.1-SNAPSHOT" val paperTestVersion = "1.21.8-R0.1-SNAPSHOT" val junit5Version = "5.12.2" val junitPlatformVersion = "1.12.2"