Fixed an issue with ability modifiers w/ non null default values

not being able to take strictly null values

src/main/java/net/Indyuce/mmoitems/api/util/NumericStatFormula.java

@@ -28,8 +28,7 @@ public class NumericStatFormula implements RandomStatData {
 	 * Throws an IAE either if the format is not good or if the object does not
 	 * have the right type
 	 * 
-	 * @param object
+	 * @param object Object to read data from.
-	 *            Object to read data from.
 	 */
 	public NumericStatFormula(Object object) {
 		Validate.notNull(object, "Config must not be null");
@@ -71,19 +70,15 @@ public class NumericStatFormula implements RandomStatData {
 	 * accordingly to the item level but also have a more or less important
 	 * gaussian based random factor
 	 * 
-	 * @param base
+	 * @param base      Base value
-	 *            Base value
+	 * @param scale     Value which scales with the item level
-	 * @param scale
+	 * @param spread    The relative standard deviation of a normal law centered
-	 *            Value which scales with the item level
+	 *                  on (base + scale * level). If it's set to 0.1, the
-	 * @param spread
+	 *                  standard deviation will be 10% of the stat value without
-	 *            The relative standard deviation of a normal law centered on
+	 *                  the random factor.
-	 *            (base + scale * level). If it's set to 0.1, the standard
+	 * @param maxSpread The max amount of deviation you can have. If it's set to
-	 *            deviation will be 10% of the stat value without the random
+	 *                  0.3, let A = base + scale * level, then the final stat
-	 *            factor.
+	 *                  value will be in [0.7 * A, 1.3 * A]
-	 * @param maxSpread
-	 *            The max amount of deviation you can have. If it's set to 0.3,
-	 *            let A = base + scale * level, then the final stat value will
-	 *            be in [0.7 * A, 1.3 * A]
 	 */
 	public NumericStatFormula(double base, double scale, double spread, double maxSpread) {
 		this.base = base;
@@ -121,16 +116,16 @@ public class NumericStatFormula implements RandomStatData {
 	 * Save some formula in a config file. This method is used when editing stat
 	 * data in the edition GUI (when a player inputs a numeric formula)
 	 * 
-	 * @param config
+	 * @param config The formula will be saved in that config file
-	 *            The formula will be saved in that config file
+	 * @param path   The config path used to save the formula
-	 * @param path
-	 *            The config path used to save the formula
 	 */
-	public void fillConfigurationSection(ConfigurationSection config, String path) {
+	public void fillConfigurationSection(ConfigurationSection config, String path, FormulaSaveOption option) {
 		if (path == null)
 			throw new NullPointerException("Path was empty");
+
 		if (scale == 0 && spread == 0 && maxSpread == 0)
-			config.set(path, base == 0 ? null : base);
+			config.set(path, base == 0 && option == FormulaSaveOption.DELETE_IF_ZERO ? null : base);
+
 		else {
 			config.set(path + ".base", base);
 			config.set(path + ".scale", scale);
@@ -139,6 +134,10 @@ public class NumericStatFormula implements RandomStatData {
 		}
 	}
 
+	public void fillConfigurationSection(ConfigurationSection config, String path) {
+		fillConfigurationSection(config, path, FormulaSaveOption.DELETE_IF_ZERO);
+	}
+
 	@Override
 	public String toString() {
 
@@ -152,4 +151,20 @@ public class NumericStatFormula implements RandomStatData {
 		return "{Base=" + digit.format(base) + (scale != 0 ? ",Scale=" + digit.format(scale) : "") + (spread != 0 ? ",Spread=" + spread : "")
 				+ (maxSpread != 0 ? ",Max=" + maxSpread : "") + "}";
 	}
+
+	public static enum FormulaSaveOption {
+
+		/**
+		 * When toggled on, if the formula is set to 0 then the configuration
+		 * section will just be deleted. This option fixes a bug where ability
+		 * modifiers with non null default values cannot take strictly null
+		 * values because inputting 0 would just delete the config section.
+		 */
+		DELETE_IF_ZERO,
+
+		/**
+		 * No option used
+		 */
+		NONE;
+	}
 }

src/main/java/net/Indyuce/mmoitems/stat/Abilities.java

@@ -1,8 +1,19 @@
 package net.Indyuce.mmoitems.stat;
 
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.Validate;
+import org.bukkit.ChatColor;
+import org.bukkit.Material;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.event.inventory.InventoryClickEvent;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonParser;
 import com.google.gson.JsonSyntaxException;
+
 import net.Indyuce.mmoitems.ItemStats;
 import net.Indyuce.mmoitems.MMOItems;
 import net.Indyuce.mmoitems.MMOUtils;
@@ -11,6 +22,7 @@ import net.Indyuce.mmoitems.api.ability.Ability.CastingMode;
 import net.Indyuce.mmoitems.api.item.build.ItemStackBuilder;
 import net.Indyuce.mmoitems.api.item.mmoitem.ReadMMOItem;
 import net.Indyuce.mmoitems.api.util.NumericStatFormula;
+import net.Indyuce.mmoitems.api.util.NumericStatFormula.FormulaSaveOption;
 import net.Indyuce.mmoitems.gui.edition.AbilityListEdition;
 import net.Indyuce.mmoitems.gui.edition.EditionInventory;
 import net.Indyuce.mmoitems.stat.data.AbilityData;
@@ -22,15 +34,6 @@ import net.Indyuce.mmoitems.stat.data.type.StatData;
 import net.Indyuce.mmoitems.stat.type.ItemStat;
 import net.mmogroup.mmolib.api.item.ItemTag;
 import net.mmogroup.mmolib.api.util.AltChar;
-import org.apache.commons.lang.Validate;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.event.inventory.InventoryClickEvent;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Abilities extends ItemStat {
 	private final DecimalFormat modifierFormat = new DecimalFormat("0.#");
@@ -119,7 +122,8 @@ public class Abilities extends ItemStat {
 			return;
 		}
 
-		new NumericStatFormula(message).fillConfigurationSection(inv.getEditedSection(), "ability." + configKey + "." + edited);
+		new NumericStatFormula(message).fillConfigurationSection(inv.getEditedSection(), "ability." + configKey + "." + edited,
+				FormulaSaveOption.NONE);
 		inv.registerTemplateEdition();
 		inv.getPlayer().sendMessage(MMOItems.plugin.getPrefix() + ChatColor.GOLD + MMOUtils.caseOnWords(edited.replace("-", " ")) + ChatColor.GRAY
 				+ " successfully added.");