Fixed potion wrapper work better no mater Minecraft version

Also fixed some missing javadoc and improve some with better grammar.

Author: broken1arrow

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

@@ -1,9 +1,8 @@
 package org.broken.arrow.library.itemcreator.meta;
 
-import org.broken.arrow.library.itemcreator.meta.potion.PotionData;
+import org.broken.arrow.library.itemcreator.meta.potion.PotionTypeWrapper;
 import org.broken.arrow.library.itemcreator.meta.potion.PotionModifier;
 import org.broken.arrow.library.itemcreator.meta.potion.PotionsUtility;
-import org.bukkit.Color;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.PotionEffect;
@@ -31,7 +30,7 @@ public class BottleEffectMeta {
     private boolean waterBottle;
     private boolean override = true;
     private ColorMeta colorMeta;
-    private PotionData potionData;
+    private PotionTypeWrapper potionTypeWrapper;
     private boolean extended;
     private boolean upgraded;
 
@@ -136,11 +135,11 @@ public BottleEffectMeta setWaterBottle(final boolean waterBottle) {
      */
     @Nullable
     public PotionType getPotionType() {
-        return (this.potionData == null ? null : this.potionData.getPotionType());
+        return (this.potionTypeWrapper == null ? null : this.potionTypeWrapper.getPotionType());
     }
 
     /**
-     * Sets the predefined {@link PotionData} to apply to this potion item.
+     * Sets the predefined {@link PotionTypeWrapper} to apply to this potion item.
      * <p>
      * This automatically handles version compatibility. You can specify the desired
      * potion variant (e.g., long, strong, or base version), and it will use the correct
@@ -162,11 +161,11 @@ public PotionType getPotionType() {
      * a potion type (or set it to {@code null}) and use the appropriate setters instead.
      * </p>
      *
-     * @param potionData the potion type to apply; set {@code null} to allow custom effects
+     * @param potionTypeWrapper the potion type to apply; set {@code null} to allow custom effects
      * @return this instance for method chaining.
      */
-    public BottleEffectMeta setPotionData(@Nullable final PotionData potionData) {
-        this.potionData = potionData;
+    public BottleEffectMeta setPotionData(@Nullable final PotionTypeWrapper potionTypeWrapper) {
+        this.potionTypeWrapper = potionTypeWrapper;
         return this;
     }
 
@@ -245,7 +244,7 @@ public void applyBottleEffects(@Nonnull final ItemMeta itemMeta) {
                 return;
             }
 
-            if (this.potionData != null && this.setPotionType(potionMeta)) {
+            if (this.potionTypeWrapper != null && this.setPotionType(potionMeta)) {
                 return;
             }
 
@@ -265,7 +264,7 @@ private boolean setPotionType(@Nonnull final PotionMeta potionMeta) {
         final PotionType potionType = this.getPotionType();
         if (potionType != null) {
             PotionsUtility potionsUtility = new PotionsUtility(potionMeta);
-            PotionModifier modifier = this.potionData.getModifier();
+            PotionModifier modifier = this.potionTypeWrapper.getModifier();
             potionsUtility.setPotion(potionType, modifier);
             return true;
         }

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

@@ -5,20 +5,22 @@
 import org.bukkit.Color;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.logging.Level;
 
 public class ColorMeta {
     private static final Logging logger = new Logging(ColorMeta.class);
-    private String rgb;
-    private Color color = Color.fromRGB(0,0,0);
+    private String rgb = "";
+    @Nullable
+    private Color color;
 
     /**
      * Get red color.
      *
      * @return red component, from 0 to 255.
      */
     public int getRed() {
-        return color.getRed();
+        return this.getColor().getRed();
     }
 
     /**
@@ -27,7 +29,7 @@ public int getRed() {
      * @return green component, from 0 to 255.
      */
     public int getGreen() {
-        return color.getGreen();
+        return this.getColor().getGreen();
     }
 
     /**
@@ -36,7 +38,7 @@ public int getGreen() {
      * @return blue component, from 0 to 255.
      */
     public int getBlue() {
-        return color.getBlue();
+        return this.getColor().getBlue();
     }
 
     /**
@@ -45,7 +47,7 @@ public int getBlue() {
      * @return alpha component, from 0 to 255.
      */
     public int getAlpha() {
-        return color.getAlpha();
+        return this.getColor().getAlpha();
     }
 
     /**
@@ -63,7 +65,7 @@ public String getRgb() {
      * @return An integer representation of this color, as 0xRRGGBB
      */
     public int toRgb() {
-        return color.asRGB();
+        return this.getColor().asRGB();
     }
 
     /**
@@ -72,15 +74,17 @@ public int toRgb() {
      * @return An integer representation of this color, as 0xAARRGGBB
      */
     public int toArgb() {
-        return color.asARGB();
+        return this.getColor().asARGB();
     }
 
     /**
      * Retrieve the color set.
      *
-     * @return the color set.
+     * @return the color set or if not set it will return default black color.
      */
     public Color getColor() {
+        if (this.color == null)
+            return Color.fromRGB(0, 0, 0);
         return this.color;
     }
 
@@ -133,24 +137,37 @@ public void setRgb(final String rgb) {
             final int colorGreen = Integer.parseInt(colors[2]);
             final int colorBlue = Integer.parseInt(colors[1]);
 
-            this.setRgb(255,colorRed, colorGreen, colorBlue);
+            this.setRgb(255, colorRed, colorGreen, colorBlue);
         } catch (final NumberFormatException exception) {
             logger.log(Level.WARNING, exception, () -> "you don´t use numbers inside this string. Your input: " + rgb);
         }
     }
 
+    /**
+     * Creates a new Color object from a red, green, and blue
+     *
+     * @param red   integer from 0-255
+     * @param green integer from 0-255
+     * @param blue  integer from 0-255
+     * @throws Validate.ValidateExceptions if any value is strictly {@literal >255 or <0}
+     */
+    public void setRgb(final int red, final int green, final int blue) {
+        Validate.checkBoolean(red < 0 || green < 0 || blue < 0, "You can't use negative numbers for the rbg color.");
+        this.setRgb(255, red, green, blue);
+    }
+
     /**
      * Creates a new Color object from an alpha, red, green, and blue
      *
      * @param alpha integer from 0-255
-     * @param red integer from 0-255
+     * @param red   integer from 0-255
      * @param green integer from 0-255
-     * @param blue integer from 0-255
+     * @param blue  integer from 0-255
      * @throws Validate.ValidateExceptions if any value is strictly {@literal >255 or <0}
      */
-    public void setRgb(final int alpha,final int red, final int green, final int blue) {
-        Validate.checkBoolean(alpha < 0 ||red < 0 || green < 0 || blue < 0, "You can't use negative numbers for the arbg color.");
-        final Color color = Color.fromARGB(alpha,red, green, blue);
+    public void setRgb(final int alpha, final int red, final int green, final int blue) {
+        Validate.checkBoolean(alpha < 0 || red < 0 || green < 0 || blue < 0, "You can't use negative numbers for the arbg color.");
+        final Color color = Color.fromARGB(alpha, red, green, blue);
         this.setColor(color);
     }
 
@@ -159,7 +176,7 @@ public void setRgb(final int alpha,final int red, final int green, final int blu
      *
      * @param color The color object to set.
      */
-    private void setColor(final Color color) {
+    private void setColor(@Nonnull final Color color) {
         Validate.checkBoolean(color == null, "You can't set color to null.");
 
         final int colorRed = color.getRed();

Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/map/BuildMapView.java

@@ -274,7 +274,7 @@ public void setLocked(final boolean locked) {
     }
 
     /**
-     * Build the {@link MapView)} with your settings set.
+     * Build the {@link MapView} with your settings set.
      *
      * @return a new MapView instance with your settings.
      */

…/itemcreator/meta/potion/PotionData.java …eator/meta/potion/PotionTypeWrapper.javaItem Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/potion/PotionData.java renamed to Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/potion/PotionTypeWrapper.java Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/potion/PotionData.java renamed to Item Creator/src/main/java/org/broken/arrow/library/itemcreator/meta/potion/PotionTypeWrapper.java

@@ -5,6 +5,8 @@
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Represents a mapping of potion data types to Minecraft's {@link PotionType},
@@ -14,7 +16,7 @@
  * <p>
  * Designed to follow the modern style used in Spigot and Paper APIs as of Minecraft 1.20 and above.
  */
-public enum PotionData {
+public enum PotionTypeWrapper {
     /**
      * Uncraftable potion (special case).
      */
@@ -186,24 +188,31 @@ public enum PotionData {
     /**
      * Slow Falling potion, long duration.
      */
-    LONG_SLOW_FALLING(PotionType.SLOW_FALLING, PotionModifier.LONG);;
+    LONG_SLOW_FALLING(PotionType.SLOW_FALLING, PotionModifier.LONG);
 
+    private static final Map<String, PotionTypeWrapper> POTION_TYPE_NAME = new HashMap<>();
     private final PotionType potionType;
     private final PotionModifier potionModifier;
     private final float serverVersion = ItemCreator.getServerVersion();
 
     /**
      * Constructs a new {@code PotionData} entry.
      *
-     * @param potionType The base {@link PotionType} associated with this potion data,
-     *                   or {@code null} for special cases like MUNDANE or WATER.
-     * @param potionModifier       The {@link PotionModifier} modifier for the potion, e.g., NORMAL, LONG, or STRONG.
+     * @param potionType     The base {@link PotionType} associated with this potion data,
+     *                       or {@code null} for special cases like MUNDANE or WATER.
+     * @param potionModifier The {@link PotionModifier} modifier for the potion, e.g., NORMAL, LONG, or STRONG.
      */
-    PotionData(@Nonnull final PotionType potionType, @Nonnull final PotionModifier potionModifier) {
+    PotionTypeWrapper(@Nonnull final PotionType potionType, @Nonnull final PotionModifier potionModifier) {
         this.potionType = potionType;
         this.potionModifier = potionModifier;
     }
 
+    static {
+        for (PotionTypeWrapper data : values()) {
+            POTION_TYPE_NAME.put(data.getPotionType().name(), data);
+        }
+    }
+
     /**
      * Retrieves the associated {@link PotionType} for this enum constant. Handles version differences
      * and special cases like uncraftable or water potions.
@@ -220,35 +229,72 @@ public PotionType getPotionType() {
     }
 
     /**
-     * Find the portion mapping from the bukkit potion type.
+     * Finds the {@link PotionTypeWrapper} corresponding to a Bukkit {@link PotionType}.
+     * <p>
+     * This method provides a fast lookup for modern potion mappings and is the recommended
+     * way to resolve wrappers when working with Bukkit's potion system on 1.20.2 and newer.
+     * Older Minecraft versions do not offer the same variety of potion types, if you need
+     * compatibility from 1.8.8 and up, use {@link #findPotionByName(String)} instead.
+     * </p>
      *
-     * @param bukkitPortionType the type you want to find.
-     * @return the PotionData instance or null if it could not find the PotionType.
+     * @param bukkitPotionType the Bukkit {@link PotionType} to find.
+     * @return the matching {@link PotionTypeWrapper}, or {@code null} if no mapping exists.
      */
     @Nullable
-    public static PotionData findPotionByType(PotionType bukkitPortionType) {
-        PotionData[] potionTypes = values();
-        for (PotionData potion : potionTypes) {
-            if (potion.getPotionType() == bukkitPortionType)
-                return potion;
-        }
-        return null;
+    public static PotionTypeWrapper findPotionByType(final PotionType bukkitPotionType) {
+        return POTION_TYPE_NAME.get(bukkitPotionType.name());
     }
 
     /**
-     * Find the portion from the bukkit potion type.
+     * Finds the {@link PotionTypeWrapper} associated with the given potion name.
+     * <p>
+     * This method supports both modern and legacy potion naming. If the provided name matches
+     * an entry in {@code POTION_TYPE_NAME}, that entry will be returned first.
+     * Otherwise, it attempts to resolve the name using {@link PotionTypeWrapper#valueOf(String)}.
+     * </p>
+     *
+     * <p><strong>Note:</strong> Using legacy potion names is discouraged, as it prevents
+     * easy retrieval of potion effect types. Prefer modern {@link PotionType} values
+     * when possible (see {@link PotionTypeWrapper}), and then use {@link #getModifier()}
+     * to obtain the correct potion modifier.</p>
      *
-     * @param bukkitPortionType the type you want to find.
-     * @return the PotionData instance or null if it could not find the PotionType.
+     * @param name the potion name to find (case-insensitive).
+     * @return the corresponding {@link PotionTypeWrapper}, or {@code null} if no match is found.
      */
     @Nullable
-    public static PotionType findPotionByName(String bukkitPortionType) {
-        PotionType[] potionTypes = PotionType.values();
-        String bukkitPortion = bukkitPortionType.toUpperCase();
-        for (PotionType potion : potionTypes) {
-            if (potion.name().equals(bukkitPortion))
-                return potion;
+    public static PotionTypeWrapper findPotionByName(final String name) {
+        String bukkitPortion = name.toUpperCase();
+        PotionTypeWrapper potionTypeWrapper = POTION_TYPE_NAME.get(bukkitPortion);
+        if (potionTypeWrapper != null)
+            return potionTypeWrapper;
+        try {
+            return PotionTypeWrapper.valueOf(bukkitPortion);
+        } catch (IllegalArgumentException e) {
+            return null;
         }
+    }
+
+    /**
+     * Resolves the Bukkit {@link PotionType} from its string name.
+     * <p>
+     * This method internally uses {@link #findPotionByName(String)} to obtain the
+     * corresponding {@link PotionTypeWrapper}, and then returns its underlying
+     * {@link PotionType}.
+     * </p>
+     *
+     * <p><strong>Note:</strong> On Minecraft versions below 1.20.2, many potions
+     * do not have distinct {@link PotionType}s. This method may therefore return a
+     * less specific type or {@code null} if the enum name is not valid.</p>
+     *
+     * @param bukkitPotionType the name of the Bukkit potion type (case-insensitive).
+     * @return the corresponding {@link PotionType}, or {@code null} if not found.
+     */
+    @Nullable
+    public static PotionType findPotionTypeByName(String bukkitPotionType) {
+        String bukkitPotion = bukkitPotionType.toUpperCase();
+        PotionTypeWrapper potionByName = findPotionByName(bukkitPotion);
+        if (potionByName != null)
+            return potionByName.getPotionType();
         return null;
     }
 
@@ -324,12 +370,12 @@ private PotionType getPotionMapping() {
      * Attempting to get the uncraftable type, this default back
      * to mundane on newer Minecraft versions like 1.21 and beyond.
      *
-     * @return A {@link PotionType#UNCRAFTABLE} if it exist
+     * @return A {@link PotionType#UNCRAFTABLE} if it exists
      * other cases {@link PotionType#MUNDANE}
      */
     @Nonnull
     private static PotionType getUncraftable() {
-        PotionType potion = findPotionByName("UNCRAFTABLE");
+        PotionType potion = findPotionTypeByName("UNCRAFTABLE");
         return potion != null ? potion : PotionType.MUNDANE;
     }