Added DummyPotionType

Author: Clashsoft

src/main/java/clashsoft/brewingapi/potion/type/AbstractPotionType.java

@@ -39,11 +39,10 @@ public AbstractPotionType register()
 		int potionID = this.getPotionID();
 		if (potionID != -1)
 		{
-			if (potionTypes.containsKey(potionID))
+			if (potionTypes.put(potionID, this) != null)
 			{
 				CSLog.warning("Registering duplicate potion ID " + potionID);
 			}
-			potionTypes.put(potionID, this);
 		}
 
 		potionTypeList.add(this);

src/main/java/clashsoft/brewingapi/potion/type/DummyPotionType.java

@@ -0,0 +1,45 @@
+package clashsoft.brewingapi.potion.type;
+
+import net.minecraft.potion.PotionEffect;
+
+import clashsoft.cslib.logging.CSLog;
+
+/**
+ * A {@link IPotionType} implementation that is used when
+ * {@link PotionType#getFromEffect_(PotionEffect)} returns null. In that case, a
+ * new instance of this class is created and registered using
+ * {@link #register()}. That ensures that {@link PotionTypeDelegates} do not
+ * throw {@link NullPointerException}s because their stored potion type is null.
+ * Potion types of this class do not get added to the creative inventory.
+ * 
+ * @author Clashsoft
+ */
+public class DummyPotionType extends PotionType
+{
+	public DummyPotionType()
+	{
+		super();
+	}
+	
+	public DummyPotionType(PotionEffect effect, int maxAmplifier, int maxDuration)
+	{
+		super(effect, maxAmplifier, maxDuration);
+	}
+	
+	@Override
+	public DummyPotionType register()
+	{
+		int potionID = this.getPotionID();
+		if (potionID != -1)
+		{
+			if (potionTypes.put(potionID, this) != null)
+			{
+				CSLog.warning("Registering duplicate potion ID " + potionID);
+			}
+		}
+		
+		potionTypeList.add(this);
+		
+		return this;
+	}
+}

src/main/java/clashsoft/brewingapi/potion/type/PotionType.java

@@ -396,7 +396,7 @@ public static IPotionType getFromEffect(PotionEffect effect)
 		{
 			return new PotionTypeDelegate(effect, potionType);
 		}
-		return new PotionType(effect, effect.getAmplifier(), effect.getDuration());
+		return new DummyPotionType(effect, effect.getAmplifier(), effect.getDuration()).register();
 	}
 
 	protected static IPotionType getFromEffect_(PotionEffect effect)