Commits

DerFrZocker authored 6ec538a00f5 Merge
Merge branch 'master' into enums-to-registers

# Conflicts: # src/main/java/org/bukkit/Bukkit.java # src/main/java/org/bukkit/Material.java # src/main/java/org/bukkit/Particle.java # src/main/java/org/bukkit/Registry.java # src/main/java/org/bukkit/Server.java # src/main/java/org/bukkit/Sound.java # src/main/java/org/bukkit/Tag.java # src/main/java/org/bukkit/block/banner/PatternType.java # src/main/java/org/bukkit/enchantments/Enchantment.java # src/main/java/org/bukkit/enchantments/EnchantmentWrapper.java # src/main/java/org/bukkit/entity/Cat.java # src/main/java/org/bukkit/entity/EntityType.java # src/main/java/org/bukkit/inventory/ItemFactory.java # src/main/java/org/bukkit/potion/PotionEffectType.java # src/main/java/org/bukkit/potion/PotionEffectTypeWrapper.java
No tags
experimental

src/main/java/org/bukkit/block/banner/PatternType.java

Modified
63 63 return patternType;
64 64 }
65 65
66 66 private static final Map<String, PatternType> byString = new HashMap<String, PatternType>();
67 67
68 68 /**
69 69 * Returns the identifier used to represent
70 70 * this pattern type
71 71 *
72 72 * @return the pattern's identifier
73 + * @see #getKey
74 + * @deprecated magic value
73 75 */
74 76 @NotNull
77 + @Deprecated
75 78 public abstract String getIdentifier();
76 79
77 80 /**
78 81 * Returns the pattern type which matches the passed
79 82 * identifier or null if no matches are found
80 83 *
81 84 * @param identifier the identifier
82 85 * @return the matched pattern type or null
86 + * @see Registry#BANNER_PATTERN
87 + * @deprecated magic value, use {@link Registry#get(NamespacedKey)} instead
83 88 */
84 89 @Contract("null -> null")
85 90 @Nullable
91 + @Deprecated
86 92 public static PatternType getByIdentifier(@Nullable String identifier) {
87 93 if (identifier == null) {
88 94 return null;
89 95 }
90 96
91 97 PatternType patternType = byString.get(identifier);
92 98 if (patternType != null) {
93 99 return patternType;
94 100 }
95 101

Everything looks good. We'll let you know here if there's anything you should know about.

Add shortcut