|
3 | 3 | import java.util.function.BiFunction; |
4 | 4 | import org.bukkit.NamespacedKey; |
5 | 5 | import org.bukkit.Particle; |
| 6 | +import org.bukkit.Sound; |
6 | 7 | import org.bukkit.attribute.Attribute; |
7 | 8 | import org.bukkit.block.Biome; |
8 | 9 | import org.bukkit.block.banner.PatternType; |
@@ -44,6 +45,9 @@ public static String rename(ApiVersion apiVersion, String owner, String from) { |
44 | 45 | case "org/bukkit/attribute/Attribute" -> FieldRename.convertAttributeName(apiVersion, from).replace('.', '_'); |
45 | 46 | case "org/bukkit/map/MapCursor$Type" -> FieldRename.convertMapCursorTypeName(apiVersion, from); |
46 | 47 | case "org/bukkit/inventory/ItemFlag" -> FieldRename.convertItemFlagName(apiVersion, from); |
| 48 | + case "org/bukkit/Sound" -> FieldRename.convertSoundName(apiVersion, from); |
| 49 | + case "org/bukkit/inventory/ItemType" -> FieldRename.convertItemTypeName(apiVersion, from); |
| 50 | + case "org/bukkit/block/BlockType" -> FieldRename.convertBlockTypeName(apiVersion, from); |
47 | 51 | default -> from; |
48 | 52 | }; |
49 | 53 | } |
@@ -461,4 +465,41 @@ public static ItemFlag valueOf_ItemFlag(String name) { |
461 | 465 | // We don't have version-specific changes, so just use current, and don't inject a version |
462 | 466 | return ItemFlag.valueOf(FieldRename.convertItemFlagName(ApiVersion.CURRENT, name)); |
463 | 467 | } |
| 468 | + |
| 469 | + // Sound |
| 470 | + private static final FieldRenameData SOUND_DATA = FieldRenameData.Builder.newBuilder() |
| 471 | + .forAllVersions() |
| 472 | + .change("ENTITY_LEASH_KNOT_PLACE", "ITEM_LEAD_TIED") |
| 473 | + .change("ENTITY_LEASH_KNOT_BREAK", "ITEM_LEAD_BREAK") |
| 474 | + .build(); |
| 475 | + |
| 476 | + @DoNotReroute |
| 477 | + public static String convertSoundName(ApiVersion version, String from) { |
| 478 | + return FieldRename.SOUND_DATA.getReplacement(version, from); |
| 479 | + } |
| 480 | + |
| 481 | + @RerouteMethodName("valueOf") |
| 482 | + @RerouteStatic("org/bukkit/Sound") |
| 483 | + public static Sound valueOf_Sound(String name) { |
| 484 | + return Sound.valueOf(FieldRename.convertSoundName(ApiVersion.CURRENT, name)); |
| 485 | + } |
| 486 | + |
| 487 | + // ItemType |
| 488 | + private static final FieldRenameData ITEM_TYPE_DATA = FieldRenameData.Builder.newBuilder() |
| 489 | + .forAllVersions() |
| 490 | + .change("CHAIN", "IRON_CHAIN") |
| 491 | + .build(); |
| 492 | + |
| 493 | + @DoNotReroute |
| 494 | + public static String convertItemTypeName(ApiVersion version, String from) { |
| 495 | + return FieldRename.ITEM_TYPE_DATA.getReplacement(version, from); |
| 496 | + } |
| 497 | + |
| 498 | + // BlockType |
| 499 | + private static final FieldRenameData BLOCK_TYPE_DATA = ITEM_TYPE_DATA; |
| 500 | + |
| 501 | + @DoNotReroute |
| 502 | + public static String convertBlockTypeName(ApiVersion version, String from) { |
| 503 | + return FieldRename.BLOCK_TYPE_DATA.getReplacement(version, from); |
| 504 | + } |
464 | 505 | } |
0 commit comments