twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-07 15:42:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

#1020: Cast instead of using #typed when getting BlockType and ItemType to better work with testing / mocks

Browse Source 
By: DerFrZocker <derrieple@gmail.com>
This commit is contained in:
Bukkit/Spigot
2024-06-03 07:15:10 +10:00
parent f9b0675bdd
commit b0df4fc813
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
paper-api/src/main/java/org/bukkit/block/BlockType.java
View File

@@ -3409,11 +3409,12 @@ public interface BlockType extends Keyed, Translatable {
//</editor-fold>
@NotNull
private static <B extends BlockData> BlockType.Typed<B> getBlockType(@NotNull String key) {
private static <B extends BlockType> B getBlockType(@NotNull String key) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(key);
BlockType.Typed<?> blockType = Registry.BLOCK.get(namespacedKey).typed();
BlockType blockType = Registry.BLOCK.get(namespacedKey);
Preconditions.checkNotNull(blockType, "No BlockType found for %s. This is a bug.", namespacedKey);
return (BlockType.Typed<B>) blockType;
// Cast instead of using BlockType#typed, since block type can be a mock during testing and would return null
return (B) blockType;
}
/**

7
paper-api/src/main/java/org/bukkit/inventory/ItemType.java
View File

@@ -2257,11 +2257,12 @@ public interface ItemType extends Keyed, Translatable {
//</editor-fold>
@NotNull
private static <M extends ItemMeta> Typed<M> getItemType(@NotNull String key) {
private static <M extends ItemType> M getItemType(@NotNull String key) {
NamespacedKey namespacedKey = NamespacedKey.minecraft(key);
Typed<?> itemType = Registry.ITEM.get(namespacedKey).typed();
ItemType itemType = Registry.ITEM.get(namespacedKey);
Preconditions.checkNotNull(itemType, "No ItemType found for %s. This is a bug.", namespacedKey);
return (Typed<M>) itemType;
// Cast instead of using ItemType#typed, since item type can be a mock during testing and would return null
return (M) itemType;
}
/**