Skip to content
Open
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 pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.6-R0.1-SNAPSHOT</version>
<version>1.21.9-rc1-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,13 @@ private enum CopperBuildingBlock implements CompoundType {
TRAPDOOR(null, "%strapdoor", "%sdoortrap", "%shatch", "%stdoor", "%sdoort", "%strapd", "%sdtrap"),
BULB(null, "%sbulb"),
GRATE(null, "%sgrate"),
BLOCK("^[A-Z]+_(SLAB|STAIRS)", true, "%scopperblock", "%scopblock", "%scoblock"),
GOLEM_STATUE(null, "%sgolemstatue", "%sstatue", "%sgolem"),
LANTERN(null, "%slantern", "%slantern", "%slight"),
LIGHTNING_ROD(null, "%srod", "%slrod", "%slightrod"),
BARS(null, "%sbars", "%sbar", "%sbarsb", "%sbarsblock", "%sfence"),
CHAIN(null, "%schain", "%slink", "%schains", "%slinks"),
CHEST(null, "%schest", "%scontainer", "%sdrawer"),
BLOCK("^[A-Z_]+_(SLAB|STAIRS)", true, "%scopperblock", "%scopblock", "%scoblock"),
;

private final Pattern regex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ private static void add(EntityType entity, String... aliases) {
add(Material.BOOKSHELF, "bshelf", "bookcase", "casebook", "shelfbook", "bookblock", "blockbook");
add(Material.CHISELED_BOOKSHELF, "cbshelf", "cbookcase", "cshelfbook", "cbookblock", "cblockbook", "chiseledshelf", "chiseledb");
add(Material.TORCH, "burningstick", "burnstick");
add(Material.COPPER_TORCH, "copperburningstick", "copperburnstick");
add(Material.GLOWSTONE, "glowingstoneblock", "lightstoneblock", "glowstoneblock", "blockglowingstone", "blocklightstone", "blockglowstone", "glowingstone", "lightstone", "glowingblock", "lightblock", "glowblock", "lstone");
add(Material.LILY_PAD, "waterlily", "lily", "swamppad", "lpad", "wlily");
add(Material.ANCIENT_DEBRIS, "debris");
Expand Down Expand Up @@ -214,6 +215,8 @@ private static void add(EntityType entity, String... aliases) {
add(Material.TURTLE_SCUTE, "scute", "minecraft:scute");
add(EntityType.MOOSHROOM, "mushroom_cow_spawner");
add(EntityType.SNOW_GOLEM, "snowman_spawner");
// == 1.21.9 Enum Renaming Manual Fixes
add(Material.IRON_CHAIN, "chain", "minecraft:chain");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ private enum FoodType implements CompoundType {
COOKED("COOKED_[A-Z_]+", "%scooked", "%scook", "%sc", "%sgrilled", "%sgrill", "%sg", "%sroasted", "%sroast", "%sro", "%sbbq", "%stoasted", "cooked%s", "cook%s", "c%s", "grilled%s", "grill%s", "g%s", "roasted%s", "roast%s", "ro%s", "bbq%s", "toasted%s"),
HIDE("[A-Z_]+_HIDE", "%shide", "%sskin", "%scoat", "%sfur"),
STEW("[A-Z_]+_STEW", "%sstew", "%ssoup"),
RAW("^(?!COOKED_)[A-Z_]+(?!_STEW)$", "raw%s", "ra%s", "uncooked%s", "plain%s", "%s"),
RAW("^(?!COOKED_|MUSIC_DISC_)[A-Z_]+(?!_STEW)$", "raw%s", "ra%s", "uncooked%s", "plain%s", "%s"),
;

private final Pattern regex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ public String[] getNames() {
*/
@SuppressWarnings("unused")
private enum MineableItemType implements CompoundType {
// The Copper Age
NUGGET(null, "%snugget", "%snug"),
// Caves and Cliffs
RAW_ORE_BLOCK("RAW_[A-Z]+_BLOCK", "raw%soreblock", "%sorechunkblock", "r%soreblock", "raw%sorebl", "%sorechunkbl", "r%sorebl"),
RAW_ORE("RAW_[A-Z]+_ORE", "raw%sore", "%sorechunk", "r%sore"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ private enum MobType implements CompoundModifier {
BOGGED,
BREEZE,
CREAKING("creak"),
COPPER_GOLEM("coppergolem", "cgolem", "sorter"),
PLAYER("steve"),
;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public Stream<String> get(ItemProvider.Item item) {
private enum DiscType implements CompoundType {
// this is scuffed beyond belief
DISC_FRAGMENT("^DISC_FRAGMENT_5", "discfrag", "fragment"),
MUSIC_DISC("^MUSIC_DISC_[A-Z0-9]+", generateFormatsFromNames(MUSIC_DISC_NAMES))
MUSIC_DISC("^MUSIC_DISC_[A-Z0-9_]+", generateFormatsFromNames(MUSIC_DISC_NAMES))
;

private final Pattern regex;
Expand Down Expand Up @@ -82,6 +82,7 @@ private enum Track implements CompoundModifier {
CREATOR_MUSIC_BOX("MUSIC_DISC_CREATOR_MUSIC_BOX", "creatormusicbox", "creatormusicb", "creatormbox", "creatormb"),
PRECIPICE("MUSIC_DISC_PRECIPICE", "precipice"),
TEARS("MUSIC_DISC_TEARS", "tears", "ghast"),
LAVA_CHICKEN("MUSIC_DISC_LAVA_CHICKEN", "lavachicken", "lava", "chicken", "lchicken", "lchick")
;

private final Pattern regex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ private enum WoodItemType implements CompoundType {
PROPAGULE(null, "propagule%s", "%sprop", "%ssapling", "%streesapling", "%slogsapling", "%strunksapling", "%swoodsapling"),
MUDDY_ROOTS("^MUDDY_[A-Z_]+_ROOTS", "mud%sroots", "mud%sroot"),
ROOTS("^(?!MUDDY_)[A-Z_]+_ROOTS", "%sroots", "%sroot"),
SHELF(null, "%sshelf", "%srack", "%sledge", "%smantel")
;

private final Pattern regex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ public class MaterialFallbacks {
add(Material.DIRT_PATH, "GRASS_PATH");
/* 1.20.3: Grass was renamed to short grass */
add(Material.SHORT_GRASS, "GRASS");
/* 1.21.9: Chain was renamed to iron chain */
add(Material.IRON_CHAIN, "CHAIN");
}

private MaterialFallbacks() {
Expand Down