Skip to content

Commit 4ea1385

Browse files
committed
Fix the naming of getEnchantment method
Also sort out the getEnchantment SerializeItem mnethod.
1 parent d3919bc commit 4ea1385

File tree

4 files changed

+6
-14
lines changed

4 files changed

+6
-14
lines changed

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/ItemCreator.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public static String getEnchantmentName(@Nonnull final Enchantment enchantment)
335335
* <p>Notes:
336336
* <ul>
337337
* <li>The {@code enhancementName} parameter should be the NamespacedKey key for modern servers (e.g. "sharpness")
338-
* or the legacy enchantment name/id for older servers. Use {@link #getEnhancement(NamespacedKey)} on modern
338+
* or the legacy enchantment name/id for older servers. Use {@link #getEnchantment(NamespacedKey)} on modern
339339
* Minecraft versions if you want access to enchantments outside the Minecraft-provided ones.</li>
340340
* </ul>
341341
*
@@ -344,7 +344,7 @@ public static String getEnchantmentName(@Nonnull final Enchantment enchantment)
344344
* @throws NullPointerException if {@code enhancementName} is null
345345
*/
346346
@Nonnull
347-
public static Enchantment getEnhancement(@Nonnull final String enhancementName) {
347+
public static Enchantment getEnchantment(@Nonnull final String enhancementName) {
348348
return getEnchantment(null, enhancementName);
349349
}
350350

@@ -362,7 +362,7 @@ public static Enchantment getEnhancement(@Nonnull final String enhancementName)
362362
* @throws NullPointerException if {@code key} is null
363363
*/
364364
@Nonnull
365-
public static Enchantment getEnhancement(@Nonnull final NamespacedKey key) {
365+
public static Enchantment getEnchantment(@Nonnull final NamespacedKey key) {
366366
Validate.checkNotNull(key, "key must not be null");
367367
return getEnchantment(key, null);
368368
}

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/enhancement/EnhancementWrapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public EnhancementWrapper(@Nonnull final Enchantment enchantment, final int leve
4848
*/
4949
@Nonnull
5050
public Enchantment getEnchantment() {
51-
return ItemCreator.getEnhancement(enhancementName);
51+
return ItemCreator.getEnchantment(enhancementName);
5252
}
5353

5454
/**

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/serialization/itemstack/SerializeItem.java

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,14 +491,7 @@ private void setEnchantment(final ItemMeta meta) {
491491
private Enchantment getEnchantment(@Nullable final Map.Entry<String, EnhancementWrapper> enhancementEntry) {
492492
if (enhancementEntry == null) return null;
493493
final String enhancementKey = enhancementEntry.getKey();
494-
if (ItemCreator.getServerVersion() > 13.2F) {
495-
Enchantment enchantment = Enchantment.getByKey(NamespacedKey.minecraft(enhancementKey));
496-
if (enchantment == null) {
497-
enchantment = Enchantment.getByName(enhancementKey);
498-
}
499-
return enchantment;
500-
}
501-
return Enchantment.getByName(enhancementKey);
494+
return ItemCreator.getEnchantment(enhancementKey);
502495
}
503496

504497
private void setAttributeModifier(final ItemMeta meta) {

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/serialization/typeadapter/EnhancementWrapperAdapter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.google.gson.stream.JsonReader;
44
import com.google.gson.stream.JsonWriter;
55
import org.broken.arrow.library.itemcreator.ItemCreator;
6-
import org.broken.arrow.library.itemcreator.meta.enhancement.EnhancementMeta;
76
import org.broken.arrow.library.itemcreator.meta.enhancement.EnhancementWrapper;
87
import org.broken.arrow.library.itemcreator.serialization.jsonhelper.JsonReaderHelper;
98
import org.broken.arrow.library.itemcreator.serialization.jsonhelper.JsonWriterHelper;
@@ -100,7 +99,7 @@ public void setIgnoreLevelRestriction(final boolean ignoreLevelRestriction) {
10099

101100
public Enchantment getEnchantment() {
102101
if (enhancementName == null) return null;
103-
return ItemCreator.getEnhancement(enhancementName);
102+
return ItemCreator.getEnchantment(enhancementName);
104103
}
105104
}
106105

0 commit comments

Comments
 (0)