Skip to content

Commit 65120e9

Browse files
authored
Update to Minecraft 1.21.9 (#6299)
1 parent 893bae0 commit 65120e9

File tree

15 files changed

+2343
-43
lines changed

15 files changed

+2343
-43
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ target/
2828
*.class
2929
build-logic/.kotlin/
3030
build-logic/bin/
31+
bin/
32+
test-tmp/
3133

3234
# Run directory
3335
/run/

Essentials/build.gradle

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,17 @@ shadowJar {
7676
include (project(':providers:NMSReflectionProvider'))
7777
include (project(':providers:1_8Provider'))
7878
include (project(':providers:1_12Provider'))
79+
80+
// Paper in-dev adventure versions (for snapshot/pre-releases)
81+
include (dependency('io.papermc.adventure:adventure-api'))
82+
include (dependency('io.papermc.adventure:adventure-key'))
83+
include (dependency('io.papermc.adventure:adventure-nbt'))
84+
include (dependency('io.papermc.adventure:adventure-text-serializer-gson'))
85+
include (dependency('io.papermc.adventure:adventure-text-serializer-gson-legacy-impl'))
86+
include (dependency('io.papermc.adventure:adventure-text-serializer-json'))
87+
include (dependency('io.papermc.adventure:adventure-text-serializer-json-legacy-impl'))
88+
include (dependency('io.papermc.adventure:adventure-text-serializer-legacy'))
89+
include (dependency('io.papermc.adventure:adventure-text-minimessage'))
7990
}
8091
relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
8192
relocate 'org.bstats', 'com.earth2me.essentials.libs.bstats'

Essentials/src/main/java/com/earth2me/essentials/Mob.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ public enum Mob {
125125
BREEZE("Breeze", Enemies.ENEMY, "BREEZE"),
126126
BOGGED("Bogged", Enemies.ENEMY, "BOGGED"),
127127
CREAKING("Creaking", Enemies.ENEMY, "CREAKING"),
128-
HAPPY_GHAST("HappyGhast", Enemies.FRIENDLY, "HAPPY_GHAST")
128+
HAPPY_GHAST("HappyGhast", Enemies.FRIENDLY, "HAPPY_GHAST"),
129+
COPPER_GOLEM("CopperGolem", Enemies.FRIENDLY, "COPPER_GOLEM"),
129130
;
130131

131132
private static final Map<String, Mob> hashMap = new HashMap<>();

Essentials/src/main/java/com/earth2me/essentials/utils/MaterialUtil.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ public final class MaterialUtil {
3737

3838
static {
3939
HELMETS = EnumUtil.getAllMatching(Material.class, "LEATHER_HELMET", "CHAINMAIL_HELMET", "IRON_HELMET",
40-
"GOLD_HELMET", "GOLDEN_HELMET", "DIAMOND_HELMET", "NETHERITE_HELMET", "TURTLE_HELMET");
40+
"GOLD_HELMET", "GOLDEN_HELMET", "DIAMOND_HELMET", "NETHERITE_HELMET", "TURTLE_HELMET", "COPPER_HELMET");
4141

4242
CHESTPLATES = EnumUtil.getAllMatching(Material.class, "LEATHER_CHESTPLATE", "CHAINMAIL_CHESTPLATE",
4343
"IRON_CHESTPLATE", "GOLD_CHESTPLATE", "GOLDEN_CHESTPLATE", "DIAMOND_CHESTPLATE", "NETHERITE_CHESTPLATE",
44-
"ELYTRA");
44+
"ELYTRA", "COPPER_CHESTPLATE");
4545

4646
LEGGINGS = EnumUtil.getAllMatching(Material.class, "LEATHER_LEGGINGS", "CHAINMAIL_LEGGINGS",
47-
"IRON_LEGGINGS", "GOLD_LEGGINGS", "GOLDEN_LEGGINGS", "DIAMOND_LEGGINGS", "NETHERITE_LEGGINGS");
47+
"IRON_LEGGINGS", "GOLD_LEGGINGS", "GOLDEN_LEGGINGS", "DIAMOND_LEGGINGS", "NETHERITE_LEGGINGS", "COPPER_LEGGINGS");
4848

4949
BOOTS = EnumUtil.getAllMatching(Material.class, "LEATHER_BOOTS", "CHAINMAIL_BOOTS", "IRON_BOOTS",
50-
"GOLD_BOOTS", "GOLDEN_BOOTS", "DIAMOND_BOOTS", "NETHERITE_BOOTS");
50+
"GOLD_BOOTS", "GOLDEN_BOOTS", "DIAMOND_BOOTS", "NETHERITE_BOOTS", "COPPER_BOOTS");
5151

5252
BEDS = EnumUtil.getAllMatching(Material.class, "BED", "BED_BLOCK", "WHITE_BED", "ORANGE_BED",
5353
"MAGENTA_BED", "LIGHT_BLUE_BED", "YELLOW_BED", "LIME_BED", "PINK_BED", "GRAY_BED",

Essentials/src/main/java/com/earth2me/essentials/utils/VersionUtil.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,9 @@ public final class VersionUtil {
4343
public static final BukkitVersion v1_21_3_R01 = BukkitVersion.fromString("1.21.3-R0.1-SNAPSHOT");
4444
public static final BukkitVersion v1_21_5_R01 = BukkitVersion.fromString("1.21.5-R0.1-SNAPSHOT");
4545
public static final BukkitVersion v1_21_8_R01 = BukkitVersion.fromString("1.21.8-R0.1-SNAPSHOT");
46+
public static final BukkitVersion v1_21_9_R01 = BukkitVersion.fromString("1.21.9-R0.1-SNAPSHOT");
4647

47-
private static final Set<BukkitVersion> 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_8_R01);
48+
private static final Set<BukkitVersion> 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_9_R01);
4849

4950
public static final boolean PRE_FLATTENING = VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_13_0_R01);
5051

0 commit comments

Comments
 (0)