Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion foundation-bukkit/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.8-R0.1-SNAPSHOT</version>
<version>1.21.9-R0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.mineacademy</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ public enum CompMaterial {
CAVE_SPIDER_SPAWN_EGG(59, "MONSTER_EGG"),
CAVE_VINES,
CAVE_VINES_PLANT,
CHAIN,
IRON_CHAIN("CHAIN"),
CHAINMAIL_BOOTS,
CHAINMAIL_CHESTPLATE,
CHAINMAIL_HELMET,
Expand Down Expand Up @@ -1757,7 +1757,83 @@ public enum CompMaterial {
DRIED_GHAST,

// 1.21.7 new names:
MUSIC_DISC_LAVA_CHICKEN
MUSIC_DISC_LAVA_CHICKEN,

// 1.21.9 new names:
ACACIA_SHELF,
BAMBOO_SHELF,
BIRCH_SHELF,
CHERRY_SHELF,
CRIMSON_SHELF,
DARK_OAK_SHELF,
JUNGLE_SHELF,
MANGROVE_SHELF,
OAK_SHELF,
PALE_OAK_SHELF,
SPRUCE_SHELF,
WARPED_SHELF,
COPPER_TORCH,
COPPER_BARS,
EXPOSED_COPPER_BARS,
WEATHERED_COPPER_BARS,
OXIDIZED_COPPER_BARS,
WAXED_COPPER_BARS,
WAXED_EXPOSED_COPPER_BARS,
WAXED_WEATHERED_COPPER_BARS,
WAXED_OXIDIZED_COPPER_BARS,
COPPER_CHAIN,
EXPOSED_COPPER_CHAIN,
WEATHERED_COPPER_CHAIN,
OXIDIZED_COPPER_CHAIN,
WAXED_COPPER_CHAIN,
WAXED_EXPOSED_COPPER_CHAIN,
WAXED_WEATHERED_COPPER_CHAIN,
WAXED_OXIDIZED_COPPER_CHAIN,
EXPOSED_LIGHTNING_ROD,
WEATHERED_LIGHTNING_ROD,
OXIDIZED_LIGHTNING_ROD,
WAXED_LIGHTNING_ROD,
WAXED_EXPOSED_LIGHTNING_ROD,
WAXED_WEATHERED_LIGHTNING_ROD,
WAXED_OXIDIZED_LIGHTNING_ROD,
COPPER_SWORD,
COPPER_SHOVEL,
COPPER_PICKAXE,
COPPER_AXE,
COPPER_HOE,
COPPER_HELMET,
COPPER_CHESTPLATE,
COPPER_LEGGINGS,
COPPER_BOOTS,
COPPER_GOLEM_SPAWN_EGG,
COPPER_HORSE_ARMOR,
COPPER_NUGGET,
COPPER_LANTERN,
EXPOSED_COPPER_LANTERN,
WEATHERED_COPPER_LANTERN,
OXIDIZED_COPPER_LANTERN,
WAXED_COPPER_LANTERN,
WAXED_EXPOSED_COPPER_LANTERN,
WAXED_WEATHERED_COPPER_LANTERN,
WAXED_OXIDIZED_COPPER_LANTERN,
COPPER_CHEST,
EXPOSED_COPPER_CHEST,
WEATHERED_COPPER_CHEST,
OXIDIZED_COPPER_CHEST,
WAXED_COPPER_CHEST,
WAXED_EXPOSED_COPPER_CHEST,
WAXED_WEATHERED_COPPER_CHEST,
WAXED_OXIDIZED_COPPER_CHEST,
COPPER_GOLEM_STATUE,
EXPOSED_COPPER_GOLEM_STATUE,
WEATHERED_COPPER_GOLEM_STATUE,
OXIDIZED_COPPER_GOLEM_STATUE,
WAXED_COPPER_GOLEM_STATUE,
WAXED_EXPOSED_COPPER_GOLEM_STATUE,
WAXED_WEATHERED_COPPER_GOLEM_STATUE,
WAXED_OXIDIZED_COPPER_GOLEM_STATUE,
COPPER_WALL_TORCH,


;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,8 @@ public boolean isRemoved() {
WHITE_ASH("WHITE_ASH", "WHITE_ASH"),
WHITE_SMOKE("WHITE_SMOKE", "WHITE_SMOKE"),
TINTED_LEAVES("TINTED_LEAVES", "TINTED_LEAVES"),
FIREFLY("FIREFLY", "FIREFLY");
FIREFLY("FIREFLY", "FIREFLY"),
COPPER_FIRE_FLAME("COPPER_FIRE_FLAME", "COPPER_FIRE_FLAME");

/**
* Hardcoded values for best performance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1778,7 +1778,52 @@ public enum CompSound {
ENTITY_HAPPY_GHAST_AMBIENT,

// 1.21.7 new names:
MUSIC_DISC_LAVA_CHICKEN
MUSIC_DISC_LAVA_CHICKEN,

// 1.21.9 new names:
BLOCK_COPPER_CHEST_CLOSE,
BLOCK_COPPER_CHEST_OPEN,
BLOCK_COPPER_CHEST_OXIDIZED_CLOSE,
BLOCK_COPPER_CHEST_OXIDIZED_OPEN,
BLOCK_COPPER_CHEST_WEATHERED_CLOSE,
BLOCK_COPPER_CHEST_WEATHERED_OPEN,
BLOCK_COPPER_GOLEM_STATUE_BREAK,
BLOCK_COPPER_GOLEM_STATUE_FALL,
BLOCK_COPPER_GOLEM_STATUE_HIT,
BLOCK_COPPER_GOLEM_STATUE_PLACE,
BLOCK_COPPER_GOLEM_STATUE_STEP,
BLOCK_SHELF_ACTIVATE,
BLOCK_SHELF_BREAK,
BLOCK_SHELF_DEACTIVATE,
BLOCK_SHELF_FALL,
BLOCK_SHELF_HIT,
BLOCK_SHELF_MULTI_SWAP,
BLOCK_SHELF_PLACE,
BLOCK_SHELF_PLACE_ITEM,
BLOCK_SHELF_SINGLE_SWAP,
BLOCK_SHELF_STEP,
BLOCK_SHELF_TAKE_ITEM,
ENTITY_COPPER_GOLEM_BECOME_STATUE,
ENTITY_COPPER_GOLEM_DEATH,
ENTITY_COPPER_GOLEM_HURT,
ENTITY_COPPER_GOLEM_ITEM_DROP,
ENTITY_COPPER_GOLEM_ITEM_NO_DROP,
ENTITY_COPPER_GOLEM_NO_ITEM_GET,
ENTITY_COPPER_GOLEM_NO_ITEM_NO_GET,
ENTITY_COPPER_GOLEM_OXIDIZED_DEATH,
ENTITY_COPPER_GOLEM_OXIDIZED_HURT,
ENTITY_COPPER_GOLEM_OXIDIZED_SPIN,
ENTITY_COPPER_GOLEM_OXIDIZED_STEP,
ENTITY_COPPER_GOLEM_SHEAR,
ENTITY_COPPER_GOLEM_SPAWN,
ENTITY_COPPER_GOLEM_SPIN,
ENTITY_COPPER_GOLEM_STEP,
ENTITY_COPPER_GOLEM_WEATHERED_DEATH,
ENTITY_COPPER_GOLEM_WEATHERED_HURT,
ENTITY_COPPER_GOLEM_WEATHERED_SPIN,
ENTITY_COPPER_GOLEM_WEATHERED_STEP,
ITEM_ARMOR_EQUIP_COPPER,
WEATHER_END_FLASH,

;

Expand Down