8.6.1

XMaterial
Fixed DRAGON_HEAD in pre-1.13
Fixed ink sacks matching black dye in pre-1.13
Fixed spawn eggs for pre-1.13

XPotion
Fixed initialization error.
Fixed INSTANT_DAMAGE potion on 1.8

Author: CryptoMorin

.travis.yml

@@ -1,5 +1,5 @@
 language: java
 install: true
-# Hoping it uses JDK 17+ for it to compile 1.18 classes.
+# Should always use the latest JDK
 jdk: openjdk17
 script: mvn install -Dgpg.skip=true -Dmaven.javadoc.skip=true -B -ntp

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.github.cryptomorin</groupId>
     <artifactId>XSeries</artifactId>
-    <version>8.6.0.0.1</version>
+    <version>8.6.1</version>
 
     <name>XSeries</name>
     <description>A set of utilities for Minecraft plugins</description>

src/main/java/com/cryptomorin/xseries/XMaterial.java

@@ -31,6 +31,8 @@
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.inventory.meta.SpawnEggMeta;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -163,7 +165,7 @@ public enum XMaterial {
     BLACK_CARPET(15, "CARPET"),
     BLACK_CONCRETE(15, "CONCRETE"),
     BLACK_CONCRETE_POWDER(15, "CONCRETE_POWDER"),
-    BLACK_DYE("INK_SACK", "INK_SAC"),
+    BLACK_DYE,
     BLACK_GLAZED_TERRACOTTA,
     BLACK_SHULKER_BOX,
     BLACK_STAINED_GLASS(15, "STAINED_GLASS"),
@@ -465,7 +467,7 @@ public enum XMaterial {
     DONKEY_SPAWN_EGG(32, "MONSTER_EGG"),
     DRAGON_BREATH("DRAGONS_BREATH"),
     DRAGON_EGG,
-    DRAGON_HEAD("SKULL", "SKULL_ITEM"),
+    DRAGON_HEAD(5, "SKULL", "SKULL_ITEM"),
     DRAGON_WALL_HEAD(5, "SKULL", "SKULL_ITEM"),
     DRIED_KELP,
     DRIED_KELP_BLOCK,
@@ -1682,11 +1684,21 @@ public static XMaterial matchXMaterial(@Nonnull ItemStack item) {
         String material = item.getType().name();
         byte data = (byte) (Data.ISFLAT || item.getType().getMaxDurability() > 0 ? 0 : item.getDurability());
 
+        if (!Data.ISFLAT && item.hasItemMeta() && material.equals("MONSTER_EGG")) {
+            ItemMeta meta = item.getItemMeta();
+            if (meta instanceof SpawnEggMeta) {
+                SpawnEggMeta egg = (SpawnEggMeta) meta;
+                material = egg.getSpawnedType().name() + "_SPAWN_EGG";
+            }
+        }
+
         // Check FILLED_MAP enum for more info.
         //if (!Data.ISFLAT && item.hasItemMeta() && item.getItemMeta() instanceof org.bukkit.inventory.meta.MapMeta) return FILLED_MAP;
 
-        return matchDefinedXMaterial(material, data)
-                .orElseThrow(() -> new IllegalArgumentException("Unsupported material from item: " + material + " (" + data + ')'));
+        // No orElseThrow, I don't want to deal with all that final variable bullshit.
+        Optional<XMaterial> result = matchDefinedXMaterial(material, data);
+        if (result.isPresent()) return result.get();
+        throw new IllegalArgumentException("Unsupported material from item: " + material + " (" + data + ')');
     }
 
     /**

src/main/java/com/cryptomorin/xseries/XPotion.java

@@ -69,7 +69,7 @@ public enum XPotion {
     FAST_DIGGING("HASTE", "SUPER_PICK", "DIGFAST", "DIG_SPEED", "QUICK_MINE", "SHARP"),
     FIRE_RESISTANCE("FIRE_RESIST", "RESIST_FIRE", "FIRE_RESISTANCE"),
     GLOWING("GLOW", "SHINE", "SHINY"),
-    HARM("INJURE", "DAMAGE", "HARMING", "INFLICT"),
+    HARM("INJURE", "DAMAGE", "HARMING", "INFLICT", "INSTANT_DAMAGE"),
     HEAL("HEALTH", "INSTA_HEAL", "INSTANT_HEAL", "INSTA_HEALTH", "INSTANT_HEALTH"),
     HEALTH_BOOST("BOOST_HEALTH", "BOOST", "HP"),
     HERO_OF_THE_VILLAGE("HERO", "VILLAGE_HERO"),
@@ -117,7 +117,9 @@ public enum XPotion {
     private static final XPotion[] POTIONEFFECTTYPE_MAPPING = new XPotion[VALUES.length + 1];
 
     static {
-        for (XPotion pot : VALUES) POTIONEFFECTTYPE_MAPPING[pot.type.getId()] = pot;
+        for (XPotion pot : VALUES)
+            if (pot.type != null) //noinspection deprecation
+                POTIONEFFECTTYPE_MAPPING[pot.type.getId()] = pot;
     }
 
     private final PotionEffectType type;
@@ -194,6 +196,7 @@ public static Optional<XPotion> matchXPotion(@Nonnull String potion) {
      * @throws IllegalArgumentException may be thrown as an unexpected exception.
      * @since 1.0.0
      */
+    @SuppressWarnings("deprecation")
     @Nonnull
     public static XPotion matchXPotion(@Nonnull PotionEffectType type) {
         Objects.requireNonNull(type, "Cannot match XPotion of a null potion effect type");

src/main/java/com/cryptomorin/xseries/XTag.java

@@ -1999,14 +1999,6 @@ private static XMaterial[] findAllCorals(boolean alive, boolean block, boolean f
         return list.toArray(new XMaterial[0]);
     }
 
-    private static XMaterial[] filterCorals(String name) {
-        List<XMaterial> list = new ArrayList<>();
-        for (XMaterial value : CORALS.values) {
-            if (value.name().contains(name)) list.add(value);
-        }
-        return list.toArray(new XMaterial[0]);
-    }
-
     /**
      * Checks if this Material is an obtainable item. "Obtainable items" are simply materials that can be displayed in your GUI.
      * This method is mainly designed to support pre-1.13, servers using 1.13 and above will directly have their materials checked with {@link Material#isItem()}

src/test/XSeriesTests.java

@@ -1,8 +1,4 @@
-import com.cryptomorin.xseries.ReflectionUtils;
-import com.cryptomorin.xseries.XMaterial;
-import com.cryptomorin.xseries.XPotion;
-import com.cryptomorin.xseries.XSound;
-import com.cryptomorin.xseries.XTag;
+import com.cryptomorin.xseries.*;
 import com.cryptomorin.xseries.particles.ParticleDisplay;
 import org.bukkit.Location;
 import org.bukkit.Material;