Read any number tag as enchantment level

Previously, packetevents would have only parsed shorts as the enchantment level

Author: booky10

api/src/main/java/com/github/retrooper/packetevents/protocol/item/ItemStack.java

@@ -351,10 +351,12 @@ public List<Enchantment> getEnchantments(ClientVersion version) {
                     EnchantmentType type = getEnchantmentTypeFromTag(compound, version);
 
                     if (type != null) {
-                        NBTShort levelTag = compound.getTagOfTypeOrNull("lvl", NBTShort.class);
-                        int level = levelTag.getAsInt();
-                        Enchantment enchantment = Enchantment.builder().type(type).level(level).build();
-                        enchantments.add(enchantment);
+                        NBTNumber levelTag = compound.getNumberTagOrNull("lvl");
+                        if (levelTag != null) {
+                            int level = levelTag.getAsInt();
+                            Enchantment enchantment = Enchantment.builder().type(type).level(level).build();
+                            enchantments.add(enchantment);
+                        }
                     }
                 }
                 return enchantments;
@@ -391,9 +393,9 @@ public int getEnchantmentLevel(EnchantmentType enchantment, ClientVersion versio
             if (nbtList != null) {
                 for (NBTCompound base : nbtList.getTags()) {
                     EnchantmentType type = getEnchantmentTypeFromTag(base, version);
-                    if (enchantment == type) {
-                        NBTShort nbtShort = base.getTagOfTypeOrNull("lvl", NBTShort.class);
-                        return nbtShort != null ? nbtShort.getAsInt() : 0;
+                    if (Objects.equals(type, enchantment)) {
+                        NBTNumber nbtLevel = base.getNumberTagOrNull("lvl");
+                        return nbtLevel != null ? nbtLevel.getAsInt() : 0;
                     }
                 }
             }

api/src/main/java/com/github/retrooper/packetevents/resources/ResourceLocation.java

@@ -18,6 +18,9 @@
 
 package com.github.retrooper.packetevents.resources;
 
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.Nullable;
+
 import java.util.Objects;
 
 public class ResourceLocation {
@@ -45,7 +48,11 @@ public ResourceLocation(String location) {
         this.key = array[1];
     }
 
-    public static String normString(String location) {
+    @Contract("null -> null; !null -> !null")
+    public static @Nullable String normString(@Nullable String location) {
+        if (location == null) {
+            return null;
+        }
         int index = location.indexOf(':');
         if (index > 0) {
             return location; // namespace already set