Ensure that we're not spamming sounds

Fixes #1834

Changelog.txt

@@ -20,6 +20,7 @@ Version 1.4.08-dev
  + Added new experience bonus perk 'mcmmo.perks.xp.10percentboost.<skillname>' multiplies incoming XP by 1.1
  + Added new experience bonus perk 'mcmmo.perks.xp.customboost.<skillname>' multiplies incoming XP by the boost amount defined in the experience config
  + Added Ender Dragon, Wither, and Witch to combat experience multipliers - they do not give XP by default
+ + Added support for multiple mod config files, naming can be done as either armor.<modname>.yml or <modname>.armor.yml
  = Fixed bug where LeafBlower permissions were ignored
  = Fixed bug with toggle commands not properly displaying the success message.
  = Fixed IllegalArgumentException caused by an empty Fishing treasure category

src/main/java/com/gmail/nossr50/config/Config.java

@@ -376,7 +376,7 @@ public class Config extends AutoUpdateConfigLoader {
     public int getPTPCommandWarmup() { return config.getInt("Commands.ptp.Warmup", 5); }
     public int getPTPCommandRecentlyHurtCooldown() { return config.getInt("Commands.ptp.RecentlyHurt_Cooldown", 60); }
     public int getPTPCommandTimeout() { return config.getInt("Commands.ptp.Request_Timeout", 300); }
-    public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Confirm_Required", true); }
+    public boolean getPTPCommandConfirmRequired() { return config.getBoolean("Commands.ptp.Accept_Required", true); }
     public boolean getPTPCommandWorldPermissions() { return config.getBoolean("Commands.ptp.World_Based_Permissions", false); }
 
     /* Inspect command distance */

src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.config.mods;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class ArmorConfigManager {
+    public ArmorConfigManager(mcMMO plugin) {
+        Pattern middlePattern = Pattern.compile("armor\\.(?:.+)\\.yml");
+        Pattern startPattern = Pattern.compile("(?:.+)\\.armor\\.yml");
+        File dataFolder = new File(mcMMO.getModDirectory());
+        File vanilla = new File(dataFolder, "armor.default.yml");
+        ModManager modManager = mcMMO.getModManager();
+
+        if (!vanilla.exists()) {
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "armor.default.yml", false);
+        }
+
+        for (String fileName : dataFolder.list()) {
+            if (!middlePattern.matcher(fileName).matches() && !startPattern.matcher(fileName).matches()) {
+                continue;
+            }
+
+            File file = new File(dataFolder, fileName);
+
+            if (file.isDirectory()) {
+                continue;
+            }
+
+            modManager.registerCustomArmor(new CustomArmorConfig(fileName));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.config.mods;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class BlockConfigManager {
+    public BlockConfigManager(mcMMO plugin) {
+        Pattern middlePattern = Pattern.compile("blocks\\.(?:.+)\\.yml");
+        Pattern startPattern = Pattern.compile("(?:.+)\\.blocks\\.yml");
+        File dataFolder = new File(mcMMO.getModDirectory());
+        File vanilla = new File(dataFolder, "blocks.default.yml");
+        ModManager modManager = mcMMO.getModManager();
+
+        if (!vanilla.exists()) {
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "blocks.default.yml", false);
+        }
+
+        for (String fileName : dataFolder.list()) {
+            if (!middlePattern.matcher(fileName).matches() && !startPattern.matcher(fileName).matches()) {
+                continue;
+            }
+
+            File file = new File(dataFolder, fileName);
+
+            if (file.isDirectory()) {
+                continue;
+            }
+
+            modManager.registerCustomBlocks(new CustomBlockConfig(fileName));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java

@@ -16,42 +16,22 @@ import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 
 public class CustomArmorConfig extends ConfigLoader {
-    private static CustomArmorConfig instance;
-
     private boolean needsUpdate = false;
 
-    private List<Repairable> repairables;
+    public List<Material> customBoots       = new ArrayList<Material>();
+    public List<Material> customChestplates = new ArrayList<Material>();
+    public List<Material> customHelmets     = new ArrayList<Material>();
+    public List<Material> customLeggings    = new ArrayList<Material>();
 
-    private List<Material> customBoots       = new ArrayList<Material>();
-    private List<Material> customChestplates = new ArrayList<Material>();
-    private List<Material> customHelmets     = new ArrayList<Material>();
-    private List<Material> customLeggings    = new ArrayList<Material>();
+    public List<Repairable> repairables = new ArrayList<Repairable>();
 
-    public CustomArmorConfig() {
-        super("mods", "armor.yml");
+    protected CustomArmorConfig(String fileName) {
+        super("mods", fileName);
         loadKeys();
     }
 
-    public static CustomArmorConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomArmorConfig();
-        }
-
-        return instance;
-    }
-
-    public List<Repairable> getLoadedRepairables() {
-        if (repairables == null) {
-            return new ArrayList<Repairable>();
-        }
-
-        return repairables;
-    }
-
     @Override
     protected void loadKeys() {
-        repairables = new ArrayList<Repairable>();
-
         loadArmor("Boots", customBoots);
         loadArmor("Chestplates", customChestplates);
         loadArmor("Helmets", customHelmets);
@@ -117,20 +97,4 @@ public class CustomArmorConfig extends ConfigLoader {
             materialList.add(armorMaterial);
         }
     }
-
-    public boolean isCustomBoots(Material material) {
-        return customBoots.contains(material);
-    }
-
-    public boolean isCustomChestplate(Material material) {
-        return customChestplates.contains(material);
-    }
-
-    public boolean isCustomHelmet(Material material) {
-        return customHelmets.contains(material);
-    }
-
-    public boolean isCustomLeggings(Material material) {
-        return customLeggings.contains(material);
-    }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java

@@ -13,40 +13,29 @@ import com.gmail.nossr50.config.ConfigLoader;
 import com.gmail.nossr50.datatypes.mods.CustomBlock;
 
 public class CustomBlockConfig extends ConfigLoader {
-    private static CustomBlockConfig instance;
-
     private boolean needsUpdate = false;
 
-    private List<MaterialData> customExcavationBlocks  = new ArrayList<MaterialData>();
-    private List<MaterialData> customHerbalismBlocks   = new ArrayList<MaterialData>();
-    private List<MaterialData> customMiningBlocks      = new ArrayList<MaterialData>();
-    private List<MaterialData> customWoodcuttingBlocks = new ArrayList<MaterialData>();
-    private List<MaterialData> customOres              = new ArrayList<MaterialData>();
-    private List<MaterialData> customLogs              = new ArrayList<MaterialData>();
-    private List<MaterialData> customLeaves            = new ArrayList<MaterialData>();
-    private List<MaterialData> customAbilityBlocks     = new ArrayList<MaterialData>();
+    public List<MaterialData> customExcavationBlocks  = new ArrayList<MaterialData>();
+    public List<MaterialData> customHerbalismBlocks   = new ArrayList<MaterialData>();
+    public List<MaterialData> customMiningBlocks      = new ArrayList<MaterialData>();
+    public List<MaterialData> customOres              = new ArrayList<MaterialData>();
+    public List<MaterialData> customLogs              = new ArrayList<MaterialData>();
+    public List<MaterialData> customLeaves            = new ArrayList<MaterialData>();
+    public List<MaterialData> customAbilityBlocks     = new ArrayList<MaterialData>();
 
-    private HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
+    public HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
 
-    public CustomBlockConfig() {
-        super("mods", "blocks.yml");
+    protected CustomBlockConfig(String fileName) {
+        super("mods", fileName);
         loadKeys();
     }
 
-    public static CustomBlockConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomBlockConfig();
-        }
-
-        return instance;
-    }
-
     @Override
     protected void loadKeys() {
         loadBlocks("Excavation", customExcavationBlocks);
         loadBlocks("Herbalism", customHerbalismBlocks);
         loadBlocks("Mining", customMiningBlocks);
-        loadBlocks("Woodcutting", customWoodcuttingBlocks);
+        loadBlocks("Woodcutting", null);
         loadBlocks("Ability_Blocks", customAbilityBlocks);
 
         if (needsUpdate) {
@@ -85,7 +74,10 @@ public class CustomBlockConfig extends ConfigLoader {
 
             byte blockData = (blockInfo.length == 2) ? Byte.valueOf(blockInfo[1]) : 0;
             MaterialData blockMaterialData = new MaterialData(blockMaterial, blockData);
-            blockList.add(blockMaterialData);
+
+            if (blockList != null) {
+                blockList.add(blockMaterialData);
+            }
 
             if (skillType.equals("Ability_Blocks")) {
                 continue;
@@ -111,40 +103,4 @@ public class CustomBlockConfig extends ConfigLoader {
             customBlockMap.put(blockMaterialData, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
         }
     }
-
-    public CustomBlock getCustomBlock(MaterialData data) {
-        return customBlockMap.get(data);
-    }
-
-    public boolean isCustomOre(MaterialData data) {
-        return customOres.contains(data);
-    }
-
-    public boolean isCustomLog(MaterialData data) {
-        return customLogs.contains(data);
-    }
-
-    public boolean isCustomLeaf(MaterialData data) {
-        return customLeaves.contains(data);
-    }
-
-    public boolean isCustomAbilityBlock(MaterialData data) {
-        return customAbilityBlocks.contains(data);
-    }
-
-    public boolean isCustomExcavationBlock(MaterialData data) {
-        return customExcavationBlocks.contains(data);
-    }
-
-    public boolean isCustomHerbalismBlock(MaterialData data) {
-        return customHerbalismBlocks.contains(data);
-    }
-
-    public boolean isCustomMiningBlock(MaterialData data) {
-        return customMiningBlocks.contains(data);
-    }
-
-    public boolean isCustomWoodcuttingBlock(MaterialData data) {
-        return customWoodcuttingBlocks.contains(data);
-    }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java

@@ -3,7 +3,6 @@ package com.gmail.nossr50.config.mods;
 import java.util.HashMap;
 
 import org.bukkit.Material;
-import org.bukkit.entity.Entity;
 import org.bukkit.material.MaterialData;
 
 import com.gmail.nossr50.config.ConfigLoader;
@@ -12,24 +11,14 @@ import com.gmail.nossr50.datatypes.mods.CustomEntity;
 import org.apache.commons.lang.ClassUtils;
 
 public class CustomEntityConfig extends ConfigLoader {
-    private static CustomEntityConfig instance;
+    public HashMap<String, CustomEntity> customEntityClassMap = new HashMap<String, CustomEntity>();
+    public HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
 
-    private HashMap<String, CustomEntity> customEntityClassMap = new HashMap<String, CustomEntity>();
-    private HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
-
-    public CustomEntityConfig() {
-        super("mods", "entities.yml");
+    protected CustomEntityConfig(String fileName) {
+        super("mods", fileName);
         loadKeys();
     }
 
-    public static CustomEntityConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomEntityConfig();
-        }
-
-        return instance;
-    }
-
     @Override
     protected void loadKeys() {
         if (config.getConfigurationSection("Hostile") != null) {
@@ -71,47 +60,4 @@ public class CustomEntityConfig extends ConfigLoader {
             customEntityClassMap.put(clazz == null ? null : clazz.getName(), entity);
         }
     }
-
-    public boolean isCustomEntity(Entity entity) {
-        if (customEntityTypeMap.containsKey(entity.getType().toString())) {
-            return true;
-        }
-
-        try {
-            return customEntityClassMap.containsKey(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
-        }
-        catch (Exception e) {
-            if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
-                return customEntityClassMap.containsKey(entity.getClass().getName());
-            }
-
-            e.printStackTrace();
-            return false;
-        }
-    }
-
-    public CustomEntity getCustomEntity(Entity entity) {
-        CustomEntity customEntity = customEntityTypeMap.get(entity.getType().toString());
-
-        if (customEntity == null) {
-            try {
-                customEntity = customEntityClassMap.get(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
-            }
-            catch (Exception e) {
-                if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
-                    customEntity = customEntityClassMap.get(entity.getClass().getName());
-                }
-                else {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        return customEntity;
-    }
-
-    public void addEntity(CustomEntity customEntity, String className, String entityName) {
-        customEntityTypeMap.put(entityName, customEntity);
-        customEntityClassMap.put(className, customEntity);
-    }
 }

src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java

@@ -18,46 +18,26 @@ import com.gmail.nossr50.skills.repair.repairables.Repairable;
 import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
 
 public class CustomToolConfig extends ConfigLoader {
-    private static CustomToolConfig instance;
-
     private boolean needsUpdate = false;
 
-    private List<Repairable> repairables;
+    public List<Material> customAxes     = new ArrayList<Material>();
+    public List<Material> customBows     = new ArrayList<Material>();
+    public List<Material> customHoes     = new ArrayList<Material>();
+    public List<Material> customPickaxes = new ArrayList<Material>();
+    public List<Material> customShovels  = new ArrayList<Material>();
+    public List<Material> customSwords   = new ArrayList<Material>();
 
-    private List<Material> customAxes     = new ArrayList<Material>();
-    private List<Material> customBows     = new ArrayList<Material>();
-    private List<Material> customHoes     = new ArrayList<Material>();
-    private List<Material> customPickaxes = new ArrayList<Material>();
-    private List<Material> customShovels  = new ArrayList<Material>();
-    private List<Material> customSwords   = new ArrayList<Material>();
+    public HashMap<Material, CustomTool> customToolMap = new HashMap<Material, CustomTool>();
 
-    private HashMap<Material, CustomTool> customToolMap = new HashMap<Material, CustomTool>();
+    public List<Repairable> repairables = new ArrayList<Repairable>();
 
-    private CustomToolConfig() {
-        super("mods", "tools.yml");
+    protected CustomToolConfig(String fileName) {
+        super("mods", fileName);
         loadKeys();
     }
 
-    public static CustomToolConfig getInstance() {
-        if (instance == null) {
-            instance = new CustomToolConfig();
-        }
-
-        return instance;
-    }
-
-    public List<Repairable> getLoadedRepairables() {
-        if (repairables == null) {
-            return new ArrayList<Repairable>();
-        }
-
-        return repairables;
-    }
-
     @Override
     protected void loadKeys() {
-        repairables = new ArrayList<Repairable>();
-
         loadTool("Axes", customAxes);
         loadTool("Bows", customBows);
         loadTool("Hoes", customHoes);
@@ -132,36 +112,4 @@ public class CustomToolConfig extends ConfigLoader {
             customToolMap.put(toolMaterial, tool);
         }
     }
-
-    public boolean isCustomAxe(Material material) {
-        return customAxes.contains(material);
-    }
-
-    public boolean isCustomBow(Material material) {
-        return customBows.contains(material);
-    }
-
-    public boolean isCustomHoe(Material material) {
-        return customHoes.contains(material);
-    }
-
-    public boolean isCustomPickaxe(Material material) {
-        return customPickaxes.contains(material);
-    }
-
-    public boolean isCustomShovel(Material material) {
-        return customShovels.contains(material);
-    }
-
-    public boolean isCustomSword(Material material) {
-        return customSwords.contains(material);
-    }
-
-    public boolean isCustomTool(Material material) {
-        return customToolMap.containsKey(material);
-    }
-
-    public CustomTool getCustomTool(Material material) {
-        return customToolMap.get(material);
-    }
 }

src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.config.mods;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class EntityConfigManager {
+    public EntityConfigManager(mcMMO plugin) {
+        Pattern middlePattern = Pattern.compile("entities\\.(?:.+)\\.yml");
+        Pattern startPattern = Pattern.compile("(?:.+)\\.entities\\.yml");
+        File dataFolder = new File(mcMMO.getModDirectory());
+        File vanilla = new File(dataFolder, "entities.default.yml");
+        ModManager modManager = mcMMO.getModManager();
+
+        if (!vanilla.exists()) {
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "entities.default.yml", false);
+        }
+
+        for (String fileName : dataFolder.list()) {
+            if (!middlePattern.matcher(fileName).matches() && !startPattern.matcher(fileName).matches()) {
+                continue;
+            }
+
+            File file = new File(dataFolder, fileName);
+
+            if (file.isDirectory()) {
+                continue;
+            }
+
+            modManager.registerCustomEntities(new CustomEntityConfig(fileName));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java

@@ -0,0 +1,35 @@
+package com.gmail.nossr50.config.mods;
+
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.util.ModManager;
+
+import java.io.File;
+import java.util.regex.Pattern;
+
+public class ToolConfigManager {
+    public ToolConfigManager(mcMMO plugin) {
+        Pattern middlePattern = Pattern.compile("tools\\.(?:.+)\\.yml");
+        Pattern startPattern = Pattern.compile("(?:.+)\\.tools\\.yml");
+        File dataFolder = new File(mcMMO.getModDirectory());
+        File vanilla = new File(dataFolder, "tools.default.yml");
+        ModManager modManager = mcMMO.getModManager();
+
+        if (!vanilla.exists()) {
+            plugin.saveResource(plugin.getDataFolder().getName() + File.separator + "tools.default.yml", false);
+        }
+
+        for (String fileName : dataFolder.list()) {
+            if (!middlePattern.matcher(fileName).matches() && !startPattern.matcher(fileName).matches()) {
+                continue;
+            }
+
+            File file = new File(dataFolder, fileName);
+
+            if (file.isDirectory()) {
+                continue;
+            }
+
+            modManager.registerCustomTools(new CustomToolConfig(fileName));
+        }
+    }
+}

src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.potion;
+package com.gmail.nossr50.config.skills.alchemy;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -13,7 +13,7 @@ import org.bukkit.potion.PotionEffectType;
 
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.config.ConfigLoader;
-import com.gmail.nossr50.datatypes.AlchemyPotion;
+import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 
 public class PotionConfig extends ConfigLoader {
     private static PotionConfig instance;

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.repair;
+package com.gmail.nossr50.config.skills.repair;
 
 import java.util.ArrayList;
 import java.util.List;

src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.config.repair;
+package com.gmail.nossr50.config.skills.repair;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -9,11 +9,9 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.repair.repairables.Repairable;
 
 public class RepairConfigManager {
-    private List<Repairable> repairables;
+    private final List<Repairable> repairables = new ArrayList<Repairable>();
 
     public RepairConfigManager(mcMMO plugin) {
-        repairables = new ArrayList<Repairable>();
-
         Pattern pattern = Pattern.compile("repair\\.(?:.+)\\.yml");
         File dataFolder = plugin.getDataFolder();
         File vanilla = new File(dataFolder, "repair.vanilla.yml");
@@ -34,19 +32,11 @@ public class RepairConfigManager {
             }
 
             RepairConfig rConfig = new RepairConfig(fileName);
-            List<Repairable> rConfigRepairables = rConfig.getLoadedRepairables();
-
-            if (rConfigRepairables != null) {
-                repairables.addAll(rConfigRepairables);
-            }
+            repairables.addAll(rConfig.getLoadedRepairables());
         }
     }
 
     public List<Repairable> getLoadedRepairables() {
-        if (repairables == null) {
-            return new ArrayList<Repairable>();
-        }
-
         return repairables;
     }
 }

src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java

@@ -47,7 +47,6 @@ import com.gmail.nossr50.skills.unarmed.UnarmedManager;
 import com.gmail.nossr50.skills.woodcutting.WoodcuttingManager;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.skills.ParticleEffectUtils;
@@ -76,6 +75,9 @@ public class McMMOPlayer {
     private boolean abilityUse = true;
     private boolean godMode;
 
+    private Sound recentSound;
+    private int   lastSound;
+
     private final Map<AbilityType, Boolean> abilityMode     = new HashMap<AbilityType, Boolean>();
     private final Map<AbilityType, Boolean> abilityInformed = new HashMap<AbilityType, Boolean>();
 
@@ -443,6 +445,50 @@ public class McMMOPlayer {
         godMode = !godMode;
     }
 
+    /*
+     * Sounds
+     */
+
+    /**
+     * Play a sound at the players location.
+     * Sound will only get played if it's different
+     * compared to the previously played sound or if the cooldown has expired.
+     *
+     * @param sound    The Sound to play
+     * @param volume   Volume of the sound
+     * @param pitch    Pitch of the sound
+     * @param cooldown Cooldown time between sounds
+     */
+    public void playSound(Sound sound, float volume, float pitch, int cooldown) {
+        if (getRecentSound() == sound && !SkillUtils.cooldownExpired(getLastSound(), 1)) {
+            return;
+        }
+
+        setRecentSound(sound);
+        actualizeLastSound();
+        player.playSound(player.getLocation(), sound, volume, pitch);
+    }
+
+    public void playSound(Sound sound, float volume, float pitch) {
+        playSound(sound, volume, pitch, 1);
+    }
+
+    public Sound getRecentSound() {
+        return recentSound;
+    }
+
+    public void setRecentSound(Sound recentSound) {
+        this.recentSound = recentSound;
+    }
+
+    public int getLastSound() {
+        return lastSound;
+    }
+
+    public void actualizeLastSound() {
+        lastSound = (int) (System.currentTimeMillis() / Misc.TIME_CONVERSION_FACTOR);
+    }
+
     /*
      * Skill notifications
      */
@@ -757,7 +803,7 @@ public class McMMOPlayer {
         xp = (float) (xp / skillType.getXpModifier() * ExperienceConfig.getInstance().getExperienceGainsGlobalMultiplier());
 
         if (Config.getInstance().getToolModsEnabled()) {
-            CustomTool tool = ModUtils.getToolFromItemStack(player.getItemInHand());
+            CustomTool tool = mcMMO.getModManager().getTool(player.getItemInHand());
 
             if (tool != null) {
                 xp *= tool.getXpMultiplier();
@@ -843,7 +889,7 @@ public class McMMOPlayer {
 
         ItemStack inHand = player.getItemInHand();
 
-        if (ModUtils.isCustomTool(inHand) && !ModUtils.getToolFromItemStack(inHand).isAbilityEnabled()) {
+        if (mcMMO.getModManager().isCustomTool(inHand) && !mcMMO.getModManager().getTool(inHand).isAbilityEnabled()) {
             return;
         }
 

src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.datatypes;
+package com.gmail.nossr50.datatypes.skills.alchemy;
 
 import java.util.List;
 import java.util.Map;

src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.listeners;
 
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
 import org.bukkit.GameMode;
 import org.bukkit.Material;
 import org.bukkit.Sound;
@@ -353,6 +354,7 @@ public class PlayerListener implements Listener {
         BleedTimerTask.bleedOut(player);
         mcMMOPlayer.getProfile().save();
         UserManager.remove(player.getName());
+        ScoreboardManager.teardownPlayer(player);
     }
 
     /**
@@ -373,6 +375,7 @@ public class PlayerListener implements Listener {
         }
 
         UserManager.addUser(player).actualizeRespawnATS();
+        ScoreboardManager.setupPlayer(player);
 
         if (Config.getInstance().getMOTDEnabled() && Permissions.motd(player)) {
             Motd.displayAll(player);

src/main/java/com/gmail/nossr50/listeners/ScoreboardsListener.java

@@ -1,39 +0,0 @@
-package com.gmail.nossr50.listeners;
-
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
-import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
-import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
-import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-
-public class ScoreboardsListener implements Listener {
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerJoin(PlayerJoinEvent event) {
-        ScoreboardManager.setupPlayer(event.getPlayer());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerQuit(PlayerQuitEvent event) {
-        ScoreboardManager.teardownPlayer(event.getPlayer());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerLevelUp(McMMOPlayerLevelUpEvent event) {
-        ScoreboardManager.handleLevelUp(event.getPlayer(), event.getSkill());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onPlayerXp(McMMOPlayerXpGainEvent event) {
-        ScoreboardManager.handleXp(event.getPlayer(), event.getSkill());
-    }
-
-    @EventHandler(priority = EventPriority.MONITOR)
-    public void onAbility(McMMOPlayerAbilityActivateEvent event) {
-        ScoreboardManager.cooldownUpdate(event.getPlayer(), event.getSkill());
-    }
-}

src/main/java/com/gmail/nossr50/listeners/SelfListener.java

@@ -1,5 +1,10 @@
 package com.gmail.nossr50.listeners;
 
+import com.gmail.nossr50.datatypes.skills.SkillType;
+import com.gmail.nossr50.events.experience.McMMOPlayerXpGainEvent;
+import com.gmail.nossr50.events.skills.abilities.McMMOPlayerAbilityActivateEvent;
+import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
+import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -10,12 +15,27 @@ import com.gmail.nossr50.events.experience.McMMOPlayerLevelUpEvent;
 public class SelfListener implements Listener {
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     public void onPlayerLevelUp(McMMOPlayerLevelUpEvent event) {
+        Player player = event.getPlayer();
+        SkillType skill = event.getSkill();
+
+        ScoreboardManager.handleLevelUp(player, skill);
+
         if (!Config.getInstance().getLevelUpEffectsEnabled()) {
             return;
         }
 
         if ((event.getSkillLevel() % Config.getInstance().getLevelUpEffectsTier()) == 0) {
-            event.getSkill().celebrateLevelUp(event.getPlayer());
+            skill.celebrateLevelUp(player);
         }
     }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onPlayerXp(McMMOPlayerXpGainEvent event) {
+        ScoreboardManager.handleXp(event.getPlayer(), event.getSkill());
+    }
+
+    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    public void onAbility(McMMOPlayerAbilityActivateEvent event) {
+        ScoreboardManager.cooldownUpdate(event.getPlayer(), event.getSkill());
+    }
 }

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -5,6 +5,11 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gmail.nossr50.config.mods.ArmorConfigManager;
+import com.gmail.nossr50.config.mods.BlockConfigManager;
+import com.gmail.nossr50.config.mods.EntityConfigManager;
+import com.gmail.nossr50.config.mods.ToolConfigManager;
+import com.gmail.nossr50.util.ModManager;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 import org.bukkit.metadata.FixedMetadataValue;
@@ -14,12 +19,8 @@ import org.bukkit.plugin.java.JavaPlugin;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.HiddenConfig;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomBlockConfig;
-import com.gmail.nossr50.config.mods.CustomEntityConfig;
-import com.gmail.nossr50.config.mods.CustomToolConfig;
-import com.gmail.nossr50.config.potion.PotionConfig;
-import com.gmail.nossr50.config.repair.RepairConfigManager;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
+import com.gmail.nossr50.config.skills.repair.RepairConfigManager;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.database.DatabaseManager;
 import com.gmail.nossr50.database.DatabaseManagerFactory;
@@ -27,7 +28,6 @@ import com.gmail.nossr50.listeners.BlockListener;
 import com.gmail.nossr50.listeners.EntityListener;
 import com.gmail.nossr50.listeners.InventoryListener;
 import com.gmail.nossr50.listeners.PlayerListener;
-import com.gmail.nossr50.listeners.ScoreboardsListener;
 import com.gmail.nossr50.listeners.SelfListener;
 import com.gmail.nossr50.listeners.WorldListener;
 import com.gmail.nossr50.locale.LocaleLoader;
@@ -65,6 +65,7 @@ public class mcMMO extends JavaPlugin {
     /* Managers */
     private static ChunkManager      placeStore;
     private static RepairableManager repairableManager;
+    private static ModManager        modManager;
     private static DatabaseManager   databaseManager;
     private static FormulaManager    formulaManager;
     private static HolidayManager    holidayManager;
@@ -131,6 +132,8 @@ public class mcMMO extends JavaPlugin {
 
             setupFilePaths();
 
+            modManager = new ModManager();
+
             loadConfigFiles();
 
             if (!noErrorsInConfigFiles) {
@@ -294,6 +297,10 @@ public class mcMMO extends JavaPlugin {
         return databaseManager;
     }
 
+    public static ModManager getModManager() {
+        return modManager;
+    }
+
     @Deprecated
     public static void setDatabaseManager(DatabaseManager databaseManager) {
         mcMMO.databaseManager = databaseManager;
@@ -329,13 +336,42 @@ public class mcMMO extends JavaPlugin {
 
         if (oldFlatfilePath.exists()) {
             if (!oldFlatfilePath.renameTo(new File(flatFileDirectory))) {
-                getLogger().warning("Failed to rename FlatFileStuff to flatfile !");
+                getLogger().warning("Failed to rename FlatFileStuff to flatfile!");
             }
         }
 
         if (oldModPath.exists()) {
             if (!oldModPath.renameTo(new File(modDirectory))) {
-                getLogger().warning("Failed to rename ModConfigs to mods !");
+                getLogger().warning("Failed to rename ModConfigs to mods!");
+            }
+        }
+
+        File oldArmorFile    = new File(modDirectory + "armor.yml");
+        File oldBlocksFile   = new File(modDirectory + "blocks.yml");
+        File oldEntitiesFile = new File(modDirectory + "entities.yml");
+        File oldToolsFile    = new File(modDirectory + "tools.yml");
+
+        if (oldArmorFile.exists()) {
+            if (!oldArmorFile.renameTo(new File(modDirectory + "armor.default.yml"))) {
+                getLogger().warning("Failed to rename armor.yml to armor.default.yml!");
+            }
+        }
+
+        if (oldBlocksFile.exists()) {
+            if (!oldBlocksFile.renameTo(new File(modDirectory + "blocks.default.yml"))) {
+                getLogger().warning("Failed to rename blocks.yml to blocks.default.yml!");
+            }
+        }
+
+        if (oldEntitiesFile.exists()) {
+            if (!oldEntitiesFile.renameTo(new File(modDirectory + "entities.default.yml"))) {
+                getLogger().warning("Failed to rename entities.yml to entities.default.yml!");
+            }
+        }
+
+        if (oldToolsFile.exists()) {
+            if (!oldToolsFile.renameTo(new File(modDirectory + "tools.default.yml"))) {
+                getLogger().warning("Failed to rename tools.yml to tools.default.yml!");
             }
         }
     }
@@ -373,24 +409,24 @@ public class mcMMO extends JavaPlugin {
         List<Repairable> repairables = new ArrayList<Repairable>();
 
         if (Config.getInstance().getToolModsEnabled()) {
-            repairables.addAll(CustomToolConfig.getInstance().getLoadedRepairables());
+            new ToolConfigManager(this);
         }
 
         if (Config.getInstance().getArmorModsEnabled()) {
-            repairables.addAll(CustomArmorConfig.getInstance().getLoadedRepairables());
+            new ArmorConfigManager(this);
         }
 
         if (Config.getInstance().getBlockModsEnabled()) {
-            CustomBlockConfig.getInstance();
+            new BlockConfigManager(this);
         }
 
         if (Config.getInstance().getEntityModsEnabled()) {
-            CustomEntityConfig.getInstance();
+            new EntityConfigManager(this);
         }
 
         // Load repair configs, make manager, and register them at this time
-        RepairConfigManager rManager = new RepairConfigManager(this);
-        repairables.addAll(rManager.getLoadedRepairables());
+        repairables.addAll(new RepairConfigManager(this).getLoadedRepairables());
+        repairables.addAll(modManager.getLoadedRepairables());
         repairableManager = new SimpleRepairableManager(repairables.size());
         repairableManager.registerRepairables(repairables);
     }
@@ -404,7 +440,6 @@ public class mcMMO extends JavaPlugin {
         pluginManager.registerEvents(new EntityListener(this), this);
         pluginManager.registerEvents(new InventoryListener(this), this);
         pluginManager.registerEvents(new SelfListener(), this);
-        pluginManager.registerEvents(new ScoreboardsListener(), this);
         pluginManager.registerEvents(new WorldListener(this), this);
     }
 

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java

@@ -5,7 +5,7 @@ import java.util.List;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
-import com.gmail.nossr50.config.potion.PotionConfig;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.datatypes.skills.SkillType;

src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java

@@ -18,8 +18,8 @@ import org.bukkit.inventory.InventoryView;
 import org.bukkit.inventory.ItemStack;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.potion.PotionConfig;
-import com.gmail.nossr50.datatypes.AlchemyPotion;
+import com.gmail.nossr50.config.skills.alchemy.PotionConfig;
+import com.gmail.nossr50.datatypes.skills.alchemy.AlchemyPotion;
 import com.gmail.nossr50.datatypes.skills.SecondaryAbility;
 import com.gmail.nossr50.runnables.PlayerUpdateInventoryTask;
 import com.gmail.nossr50.runnables.skills.AlchemyBrewCheckTask;
@@ -230,6 +230,7 @@ public final class AlchemyPotionBrewer {
 
             return;
         }
+
         if (event.isShiftClick()) {
             if (event.getSlotType() == SlotType.FUEL) {
                 scheduleCheck(player, brewingStand);
@@ -256,6 +257,10 @@ public final class AlchemyPotionBrewer {
         }
         else if (event.getRawSlot() == INGREDIENT_SLOT) {
             if (isEmpty(cursor) && isEmpty(clicked)) {
+                if (event.getClick() == ClickType.NUMBER_KEY) {
+                    scheduleCheck(player, brewingStand);
+                    return;
+                }
                 return;
             }
             else if (isEmpty(cursor)) {

src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java

@@ -3,13 +3,13 @@ package com.gmail.nossr50.skills.excavation;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.block.BlockState;
 
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.treasure.TreasureConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.datatypes.treasure.ExcavationTreasure;
-import com.gmail.nossr50.util.ModUtils;
 
 public class Excavation {
     /**
@@ -52,8 +52,8 @@ public class Excavation {
     protected static int getBlockXP(BlockState blockState) {
         int xp = ExperienceConfig.getInstance().getXp(SkillType.EXCAVATION, blockState.getType());
 
-        if (xp == 0 && ModUtils.isCustomExcavationBlock(blockState)) {
-            xp = ModUtils.getCustomBlock(blockState).getXpGain();
+        if (xp == 0 && mcMMO.getModManager().isCustomExcavationBlock(blockState)) {
+            xp = mcMMO.getModManager().getBlock(blockState).getXpGain();
         }
 
         return xp;

src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java

@@ -32,7 +32,6 @@ import com.gmail.nossr50.skills.SkillManager;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.StringUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -136,8 +135,8 @@ public class HerbalismManager extends SkillManager {
         int xp;
         boolean greenTerra = mcMMOPlayer.getAbilityMode(skill.getAbility());
 
-        if (ModUtils.isCustomHerbalismBlock(blockState)) {
-            CustomBlock customBlock = ModUtils.getCustomBlock(blockState);
+        if (mcMMO.getModManager().isCustomHerbalismBlock(blockState)) {
+            CustomBlock customBlock = mcMMO.getModManager().getBlock(blockState);
             xp = customBlock.getXpGain();
 
             if (Permissions.secondaryAbilityEnabled(player, SecondaryAbility.HERBALISM_DOUBLE_DROPS) && customBlock.isDoubleDropEnabled()) {

src/main/java/com/gmail/nossr50/skills/mining/Mining.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.mining;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.BlockState;
 import org.bukkit.inventory.ItemStack;
@@ -8,7 +9,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 
 public class Mining {
 
@@ -21,8 +21,8 @@ public class Mining {
         Material blockType = blockState.getType();
         int xp = ExperienceConfig.getInstance().getXp(SkillType.MINING, blockType != Material.GLOWING_REDSTONE_ORE ? blockType : Material.REDSTONE_ORE);
 
-        if (xp == 0 && ModUtils.isCustomMiningBlock(blockState)) {
-            xp = ModUtils.getCustomBlock(blockState).getXpGain();
+        if (xp == 0 && mcMMO.getModManager().isCustomMiningBlock(blockState)) {
+            xp = mcMMO.getModManager().getBlock(blockState).getXpGain();
         }
 
         return xp;
@@ -65,7 +65,7 @@ public class Mining {
                 return;
 
             default:
-                if (ModUtils.isCustomMiningBlock(blockState)) {
+                if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
                     Misc.dropItem(blockState.getLocation(), blockState.getData().toItemStack(1));
                 }
                 return;
@@ -104,7 +104,7 @@ public class Mining {
                 return;
 
             default:
-                if (ModUtils.isCustomMiningBlock(blockState)) {
+                if (mcMMO.getModManager().isCustomMiningBlock(blockState)) {
                     Misc.dropItems(blockState.getLocation(), blockState.getBlock().getDrops());
                 }
                 return;

src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java

@@ -23,7 +23,6 @@ import com.gmail.nossr50.skills.mining.BlastMining.Tier;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
@@ -70,7 +69,7 @@ public class MiningManager extends SkillManager {
             SkillUtils.handleDurabilityChange(getPlayer().getItemInHand(), Config.getInstance().getAbilityToolDamage());
         }
 
-        if ((ModUtils.isCustomMiningBlock(blockState) && !ModUtils.getCustomBlock(blockState).isDoubleDropEnabled()) || material != Material.GLOWING_REDSTONE_ORE && !Config.getInstance().getDoubleDropsEnabled(skill, material)) {
+        if ((mcMMO.getModManager().isCustomMiningBlock(blockState) && !mcMMO.getModManager().getBlock(blockState).isDoubleDropEnabled()) || material != Material.GLOWING_REDSTONE_ORE && !Config.getInstance().getDoubleDropsEnabled(skill, material)) {
             return;
         }
 

src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java

@@ -148,7 +148,7 @@ public class RepairManager extends SkillManager {
 
         // BWONG BWONG BWONG
         if (Config.getInstance().getRepairAnvilUseSoundsEnabled()) {
-            player.playSound(player.getLocation(), Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
+            mcMMOPlayer.playSound(Sound.ANVIL_USE, Misc.ANVIL_USE_VOLUME, Misc.ANVIL_USE_PITCH);
         }
 
         // Repair the item!

src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java

@@ -6,7 +6,6 @@ import java.util.List;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-
 public class SimpleRepairableManager implements RepairableManager {
     private HashMap<Material, Repairable> repairables;
 

src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.skills.smelting;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.material.MaterialData;
@@ -7,7 +8,6 @@ import org.bukkit.material.MaterialData;
 import com.gmail.nossr50.config.AdvancedConfig;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.ModUtils;
 
 public class Smelting {
     // The order of the values is extremely important, a few methods depend on it to work properly
@@ -50,6 +50,6 @@ public class Smelting {
         MaterialData data = smelting.getData();
         Material resourceType = smelting.getType();
 
-        return ModUtils.isCustomOre(data) ? ModUtils.getCustomBlock(data).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(SkillType.SMELTING, resourceType != Material.GLOWING_REDSTONE_ORE ? resourceType : Material.REDSTONE_ORE);
+        return mcMMO.getModManager().isCustomOre(data) ? mcMMO.getModManager().getBlock(data).getSmeltingXpGain() : ExperienceConfig.getInstance().getXp(SkillType.SMELTING, resourceType != Material.GLOWING_REDSTONE_ORE ? resourceType : Material.REDSTONE_ORE);
     }
 }

src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java

@@ -16,7 +16,6 @@ import com.gmail.nossr50.config.Config;
 import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.util.BlockUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
 public final class Woodcutting {
@@ -52,8 +51,8 @@ public final class Woodcutting {
                 break;
         }
 
-        if (ModUtils.isCustomLogBlock(blockState)) {
-            return ModUtils.getCustomBlock(blockState).getXpGain();
+        if (mcMMO.getModManager().isCustomLog(blockState)) {
+            return mcMMO.getModManager().getBlock(blockState).getXpGain();
         }
 
         switch (((Tree) blockState.getData()).getSpecies()) {
@@ -86,7 +85,7 @@ public final class Woodcutting {
      * @param blockState Block being broken
      */
     protected static void checkForDoubleDrop(BlockState blockState) {
-        if (ModUtils.isCustomLogBlock(blockState) && ModUtils.getCustomBlock(blockState).isDoubleDropEnabled()) {
+        if (mcMMO.getModManager().isCustomLog(blockState) && mcMMO.getModManager().getBlock(blockState).isDoubleDropEnabled()) {
             Misc.dropItems(blockState.getLocation(), blockState.getBlock().getDrops());
         }
         else {

src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java

@@ -3,6 +3,7 @@ package com.gmail.nossr50.skills.woodcutting;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
@@ -22,7 +23,6 @@ import com.gmail.nossr50.skills.woodcutting.Woodcutting.ExperienceGainMethod;
 import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.ItemUtils;
 import com.gmail.nossr50.util.Misc;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.skills.CombatUtils;
 import com.gmail.nossr50.util.skills.SkillUtils;
@@ -126,18 +126,18 @@ public class WoodcuttingManager extends SkillManager {
                 xp += Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.TREE_FELLER);
                 Misc.dropItems(blockState.getLocation(), block.getDrops());
             }
-            else if (ModUtils.isCustomLogBlock(blockState)) {
+            else if (mcMMO.getModManager().isCustomLog(blockState)) {
                 if (canGetDoubleDrops()) {
                     Woodcutting.checkForDoubleDrop(blockState);
                 }
 
-                CustomBlock customBlock = ModUtils.getCustomBlock(blockState);
+                CustomBlock customBlock = mcMMO.getModManager().getBlock(blockState);
                 xp = customBlock.getXpGain();
 
                 Misc.dropItems(blockState.getLocation(), block.getDrops());
             }
-            else if (ModUtils.isCustomLeafBlock(blockState)) {
-                Misc.randomDropItems(blockState.getLocation(), block.getDrops(), 10.0);
+            else if (mcMMO.getModManager().isCustomLeaf(blockState)) {
+                Misc.dropItems(blockState.getLocation(), block.getDrops());
             }
             else {
                 Tree tree = (Tree) blockState.getData();

src/main/java/com/gmail/nossr50/util/BlockUtils.java

@@ -2,6 +2,7 @@ package com.gmail.nossr50.util;
 
 import java.util.HashSet;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.CropState;
 import org.bukkit.Material;
 import org.bukkit.NetherWartsState;
@@ -64,7 +65,7 @@ public final class BlockUtils {
                 return false;
 
             default:
-                return !isMcMMOAnvil(blockState) && !ModUtils.isCustomAbilityBlock(blockState);
+                return !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
         }
     }
 
@@ -135,7 +136,7 @@ public final class BlockUtils {
                 return ((CocoaPlant) blockState.getData()).getSize() == CocoaPlantSize.LARGE;
 
             default:
-                return ModUtils.isCustomHerbalismBlock(blockState);
+                return mcMMO.getModManager().isCustomHerbalismBlock(blockState);
         }
     }
 
@@ -157,7 +158,7 @@ public final class BlockUtils {
                 return true;
 
             default:
-                return isOre(blockState) || ModUtils.isCustomMiningBlock(blockState);
+                return isOre(blockState) || mcMMO.getModManager().isCustomMiningBlock(blockState);
         }
     }
 
@@ -181,7 +182,7 @@ public final class BlockUtils {
                 return true;
 
             default:
-                return ModUtils.isCustomExcavationBlock(blockState);
+                return mcMMO.getModManager().isCustomExcavationBlock(blockState);
         }
     }
 
@@ -199,7 +200,7 @@ public final class BlockUtils {
                 return true;
 
             default:
-                return ModUtils.isCustomLogBlock(blockState);
+                return mcMMO.getModManager().isCustomLog(blockState);
         }
     }
 
@@ -215,7 +216,7 @@ public final class BlockUtils {
                 return true;
 
             default:
-                return ModUtils.isCustomLeafBlock(blockState);
+                return mcMMO.getModManager().isCustomLeaf(blockState);
         }
     }
 

src/main/java/com/gmail/nossr50/util/ItemUtils.java

@@ -10,9 +10,6 @@ import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.Dye;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomArmorConfig;
-import com.gmail.nossr50.config.mods.CustomToolConfig;
 import com.gmail.nossr50.config.party.ItemWeightConfig;
 import com.gmail.nossr50.locale.LocaleLoader;
 
@@ -33,7 +30,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomBow(type));
+                return mcMMO.getModManager().isCustomBow(type);
         }
     }
 
@@ -55,7 +52,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomSword(type));
+                return mcMMO.getModManager().isCustomSword(type);
         }
     }
 
@@ -77,7 +74,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomHoe(type));
+                return mcMMO.getModManager().isCustomHoe(type);
         }
     }
 
@@ -99,7 +96,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomShovel(type));
+                return mcMMO.getModManager().isCustomShovel(type);
         }
     }
 
@@ -121,7 +118,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomAxe(type));
+                return mcMMO.getModManager().isCustomAxe(type);
         }
     }
 
@@ -143,7 +140,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return (Config.getInstance().getToolModsEnabled() && CustomToolConfig.getInstance().isCustomPickaxe(type));
+                return mcMMO.getModManager().isCustomPickaxe(type);
         }
     }
 
@@ -165,7 +162,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return Config.getInstance().getArmorModsEnabled() && CustomArmorConfig.getInstance().isCustomHelmet(type);
+                return mcMMO.getModManager().isCustomHelmet(type);
         }
     }
 
@@ -187,7 +184,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return Config.getInstance().getArmorModsEnabled() && CustomArmorConfig.getInstance().isCustomChestplate(type);
+                return mcMMO.getModManager().isCustomChestplate(type);
         }
     }
 
@@ -209,7 +206,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return Config.getInstance().getArmorModsEnabled() && CustomArmorConfig.getInstance().isCustomLeggings(type);
+                return mcMMO.getModManager().isCustomLeggings(type);
         }
     }
 
@@ -231,7 +228,7 @@ public final class ItemUtils {
                 return true;
 
             default:
-                return Config.getInstance().getArmorModsEnabled() && CustomArmorConfig.getInstance().isCustomBoots(type);
+                return mcMMO.getModManager().isCustomBoots(type);
         }
     }
 

src/main/java/com/gmail/nossr50/util/MaterialUtils.java

@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.material.MaterialData;
 
 public final class MaterialUtils {
@@ -19,7 +20,7 @@ public final class MaterialUtils {
                 return true;
 
             default:
-                return ModUtils.isCustomOre(data);
+                return mcMMO.getModManager().isCustomOre(data);
         }
     }
 }

src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java

@@ -167,7 +167,7 @@ public final class MobHealthbarUtils {
                 return true;
 
             default:
-                return ModUtils.isCustomBossEntity(livingEntity);
+                return false;
         }
     }
 }

src/main/java/com/gmail/nossr50/util/ModManager.java

@@ -0,0 +1,283 @@
+package com.gmail.nossr50.util;
+
+import com.gmail.nossr50.config.Config;
+import com.gmail.nossr50.config.mods.CustomArmorConfig;
+import com.gmail.nossr50.config.mods.CustomBlockConfig;
+import com.gmail.nossr50.config.mods.CustomEntityConfig;
+import com.gmail.nossr50.config.mods.CustomToolConfig;
+import com.gmail.nossr50.datatypes.mods.CustomBlock;
+import com.gmail.nossr50.datatypes.mods.CustomEntity;
+import com.gmail.nossr50.datatypes.mods.CustomTool;
+import com.gmail.nossr50.mcMMO;
+import com.gmail.nossr50.skills.repair.repairables.Repairable;
+import org.bukkit.Material;
+import org.bukkit.block.BlockState;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Entity;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.material.MaterialData;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+public class ModManager {
+    private List<Repairable> repairables = new ArrayList<Repairable>();
+
+    // Armor Mods
+    private List<Material> customBoots       = new ArrayList<Material>();
+    private List<Material> customChestplates = new ArrayList<Material>();
+    private List<Material> customHelmets     = new ArrayList<Material>();
+    private List<Material> customLeggings    = new ArrayList<Material>();
+
+    // Block Mods
+    private List<MaterialData> customExcavationBlocks  = new ArrayList<MaterialData>();
+    private List<MaterialData> customHerbalismBlocks   = new ArrayList<MaterialData>();
+    private List<MaterialData> customMiningBlocks      = new ArrayList<MaterialData>();
+    private List<MaterialData> customOres              = new ArrayList<MaterialData>();
+    private List<MaterialData> customLogs              = new ArrayList<MaterialData>();
+    private List<MaterialData> customLeaves            = new ArrayList<MaterialData>();
+    private List<MaterialData> customAbilityBlocks     = new ArrayList<MaterialData>();
+    private HashMap<MaterialData, CustomBlock> customBlockMap = new HashMap<MaterialData, CustomBlock>();
+
+    // Entity Mods
+    private HashMap<String, CustomEntity> customEntityClassMap = new HashMap<String, CustomEntity>();
+    private HashMap<String, CustomEntity> customEntityTypeMap  = new HashMap<String, CustomEntity>();
+
+    // Tool Mods
+    private List<Material> customAxes     = new ArrayList<Material>();
+    private List<Material> customBows     = new ArrayList<Material>();
+    private List<Material> customHoes     = new ArrayList<Material>();
+    private List<Material> customPickaxes = new ArrayList<Material>();
+    private List<Material> customShovels  = new ArrayList<Material>();
+    private List<Material> customSwords   = new ArrayList<Material>();
+    private HashMap<Material, CustomTool> customToolMap = new HashMap<Material, CustomTool>();
+
+    public void registerCustomArmor(CustomArmorConfig config) {
+        customBoots.addAll(config.customBoots);
+        customChestplates.addAll(config.customChestplates);
+        customHelmets.addAll(config.customHelmets);
+        customLeggings.addAll(config.customLeggings);
+        repairables.addAll(config.repairables);
+    }
+
+    public void registerCustomBlocks(CustomBlockConfig config) {
+        customExcavationBlocks.addAll(config.customExcavationBlocks);
+        customHerbalismBlocks.addAll(config.customHerbalismBlocks);
+        customMiningBlocks.addAll(config.customMiningBlocks);
+        customOres.addAll(config.customOres);
+        customLogs.addAll(config.customLogs);
+        customLeaves.addAll(config.customLeaves);
+        customAbilityBlocks.addAll(config.customAbilityBlocks);
+        customBlockMap.putAll(config.customBlockMap);
+    }
+
+    public void registerCustomEntities(CustomEntityConfig config) {
+        customEntityClassMap.putAll(config.customEntityClassMap);
+        customEntityTypeMap.putAll(config.customEntityTypeMap);
+    }
+
+    public void registerCustomTools(CustomToolConfig config) {
+        customAxes.addAll(config.customAxes);
+        customBows.addAll(config.customBows);
+        customHoes.addAll(config.customHoes);
+        customPickaxes.addAll(config.customPickaxes);
+        customShovels.addAll(config.customShovels);
+        customSwords.addAll(config.customSwords);
+        customToolMap.putAll(config.customToolMap);
+        repairables.addAll(config.repairables);
+    }
+
+    public boolean isCustomBoots(Material material) {
+        return Config.getInstance().getArmorModsEnabled() && customBoots.contains(material);
+    }
+
+    public boolean isCustomChestplate(Material material) {
+        return Config.getInstance().getArmorModsEnabled() && customChestplates.contains(material);
+    }
+
+    public boolean isCustomHelmet(Material material) {
+        return Config.getInstance().getArmorModsEnabled() && customHelmets.contains(material);
+    }
+
+    public boolean isCustomLeggings(Material material) {
+        return Config.getInstance().getArmorModsEnabled() && customLeggings.contains(material);
+    }
+
+    public boolean isCustomAxe(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customAxes.contains(material);
+    }
+
+    public boolean isCustomBow(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customBows.contains(material);
+    }
+
+    public boolean isCustomHoe(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customHoes.contains(material);
+    }
+
+    public boolean isCustomPickaxe(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customPickaxes.contains(material);
+    }
+
+    public boolean isCustomShovel(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customShovels.contains(material);
+    }
+
+    public boolean isCustomSword(Material material) {
+        return Config.getInstance().getToolModsEnabled() && customSwords.contains(material);
+    }
+
+    public boolean isCustomOre(MaterialData data) {
+        return Config.getInstance().getBlockModsEnabled() && customOres.contains(data);
+    }
+
+    public boolean isCustomLog(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customLogs.contains(state.getData());
+    }
+
+    public boolean isCustomLeaf(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customLeaves.contains(state.getData());
+    }
+
+    public boolean isCustomAbilityBlock(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customAbilityBlocks.contains(state.getData());
+    }
+
+    public boolean isCustomExcavationBlock(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customExcavationBlocks.contains(state.getData());
+    }
+
+    public boolean isCustomHerbalismBlock(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customHerbalismBlocks.contains(state.getData());
+    }
+
+    public boolean isCustomMiningBlock(BlockState state) {
+        return Config.getInstance().getBlockModsEnabled() && customMiningBlocks.contains(state.getData());
+    }
+
+    public CustomBlock getBlock(BlockState state) {
+        return customBlockMap.get(state.getData());
+    }
+
+    public CustomBlock getBlock(MaterialData data) {
+        return customBlockMap.get(data);
+    }
+
+    /**
+     * Checks to see if an item is a custom tool.
+     *
+     * @param item Item to check
+     * @return true if the item is a custom tool, false otherwise
+     */
+    public boolean isCustomTool(ItemStack item) {
+        return Config.getInstance().getToolModsEnabled() && item != null && customToolMap.containsKey(item.getType());
+    }
+
+    /**
+     * Get the custom tool associated with an item.
+     *
+     * @param item The item to check
+     * @return the tool if it exists, null otherwise
+     */
+    public CustomTool getTool(ItemStack item) {
+        return item == null ? null : customToolMap.get(item.getType());
+    }
+
+    public List<Repairable> getLoadedRepairables() {
+        return repairables;
+    }
+
+    public boolean isCustomEntity(Entity entity) {
+        if (!Config.getInstance().getEntityModsEnabled()) {
+            return false;
+        }
+
+        if (customEntityTypeMap.containsKey(entity.getType().toString())) {
+            return true;
+        }
+
+        try {
+            return customEntityClassMap.containsKey(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
+        }
+        catch (Exception e) {
+            if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
+                return customEntityClassMap.containsKey(entity.getClass().getName());
+            }
+
+            e.printStackTrace();
+            return false;
+        }
+    }
+
+    public CustomEntity getEntity(Entity entity) {
+        CustomEntity customEntity = customEntityTypeMap.get(entity.getType().toString());
+
+        if (customEntity == null) {
+            try {
+                customEntity = customEntityClassMap.get(((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName());
+            }
+            catch (Exception e) {
+                if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
+                    customEntity = customEntityClassMap.get(entity.getClass().getName());
+                }
+                else {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return customEntity;
+    }
+
+    public void addCustomEntity(Entity entity) {
+        if (!Config.getInstance().getEntityModsEnabled()) {
+            return;
+        }
+
+        File entityFile = new File(mcMMO.p.getDataFolder(), "mods" + File.separator + "entities.default.yml");
+        YamlConfiguration entitiesFile = YamlConfiguration.loadConfiguration(entityFile);
+
+        String entityName = entity.getType().toString();
+        String sanitizedEntityName = entityName.replace(".", "_");
+
+        if (entitiesFile.getKeys(false).contains(sanitizedEntityName)) {
+            return;
+        }
+
+        entitiesFile.set(sanitizedEntityName + ".XP_Multiplier", 1.0D);
+        entitiesFile.set(sanitizedEntityName + ".Tameable", false);
+        entitiesFile.set(sanitizedEntityName + ".Taming_XP", 0);
+        entitiesFile.set(sanitizedEntityName + ".CanBeSummoned", false);
+        entitiesFile.set(sanitizedEntityName + ".COTW_Material", "");
+        entitiesFile.set(sanitizedEntityName + ".COTW_Material_Data", 0);
+        entitiesFile.set(sanitizedEntityName + ".COTW_Material_Amount", 0);
+
+        String className = "";
+
+        try {
+            className = ((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName();
+        }
+        catch (Exception e) {
+            if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
+                className = entity.getClass().getName();
+            }
+            else {
+                e.printStackTrace();
+            }
+        }
+
+        CustomEntity customEntity = new CustomEntity(1.0D, false, 0, false, null, 0);
+        customEntityTypeMap.put(entityName, customEntity);
+        customEntityClassMap.put(className, customEntity);
+
+        try {
+            entitiesFile.save(entityFile);
+            mcMMO.p.debug(entity.getType().toString() + " was added to the custom entities file!");
+        }
+        catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

src/main/java/com/gmail/nossr50/util/ModUtils.java

@@ -1,213 +0,0 @@
-package com.gmail.nossr50.util;
-
-import java.io.File;
-
-import org.bukkit.block.BlockState;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.entity.Entity;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.material.MaterialData;
-
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.config.Config;
-import com.gmail.nossr50.config.mods.CustomBlockConfig;
-import com.gmail.nossr50.config.mods.CustomEntityConfig;
-import com.gmail.nossr50.config.mods.CustomToolConfig;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-import com.gmail.nossr50.datatypes.mods.CustomEntity;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
-
-public final class ModUtils {
-    private static boolean customToolsEnabled    = Config.getInstance().getToolModsEnabled();
-    private static boolean customBlocksEnabled   = Config.getInstance().getBlockModsEnabled();
-    private static boolean customEntitiesEnabled = Config.getInstance().getEntityModsEnabled();
-
-    private ModUtils() {}
-
-    /**
-     * Get the custom tool associated with an item.
-     *
-     * @param item The item to check
-     * @return the tool if it exists, null otherwise
-     */
-    public static CustomTool getToolFromItemStack(ItemStack item) {
-        return CustomToolConfig.getInstance().getCustomTool(item.getType());
-    }
-
-    /**
-     * Get the custom entity associated with an entity.
-     *
-     * @param entity The entity to check
-     * @return the entity is if exists, null otherwise
-     */
-    public static CustomEntity getCustomEntity(Entity entity) {
-        return CustomEntityConfig.getInstance().getCustomEntity(entity);
-    }
-
-    /**
-     * Get the custom block associated with an block.
-     *
-     * @param blockState The BlockState of the bloc to check
-     * @return the block if it exists, null otherwise
-     */
-    public static CustomBlock getCustomBlock(BlockState blockState) {
-        return CustomBlockConfig.getInstance().getCustomBlock(blockState.getData());
-    }
-
-    public static CustomBlock getCustomBlock(MaterialData data) {
-        return CustomBlockConfig.getInstance().getCustomBlock(data);
-    }
-
-    /**
-     * Check if a custom block is a woodcutting block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents a custom woodcutting block, false otherwise
-     */
-    public static boolean isCustomWoodcuttingBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomWoodcuttingBlock(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block should not activate abilites.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents an ability block, false otherwise
-     */
-    public static boolean isCustomAbilityBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomAbilityBlock(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block is a mining block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents a custom mining block, false otherwise
-     */
-    public static boolean isCustomMiningBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomMiningBlock(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block is an excavation block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents a custom excavation block, false otherwise
-     */
-    public static boolean isCustomExcavationBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomExcavationBlock(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block is an herbalism block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents a custom herbalism block, false otherwise
-     */
-    public static boolean isCustomHerbalismBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomHerbalismBlock(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block is a leaf block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents leaves, false otherwise
-     */
-    public static boolean isCustomLeafBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomLeaf(blockState.getData());
-    }
-
-    /**
-     * Check if a custom block is a log block.
-     *
-     * @param blockState The BlockState of the block to check
-     * @return true if the block represents a log, false otherwise
-     */
-    public static boolean isCustomLogBlock(BlockState blockState) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomLog(blockState.getData());
-    }
-
-    public static boolean isCustomOre(MaterialData data) {
-        return customBlocksEnabled && CustomBlockConfig.getInstance().isCustomOre(data);
-    }
-
-    /**
-     * Checks to see if an item is a custom tool.
-     *
-     * @param item Item to check
-     * @return true if the item is a custom tool, false otherwise
-     */
-    public static boolean isCustomTool(ItemStack item) {
-        return customToolsEnabled && CustomToolConfig.getInstance().isCustomTool(item.getType());
-    }
-
-    /**
-     * Checks to see if an entity is a custom entity.
-     *
-     * @param entity Entity to check
-     * @return true if the entity is a custom entity, false otherwise
-     */
-    public static boolean isCustomEntity(Entity entity) {
-        return customEntitiesEnabled && CustomEntityConfig.getInstance().isCustomEntity(entity);
-    }
-
-    /**
-     * Check if a custom entity is a boss.
-     *
-     * @param entity The entity to check
-     * @return true if the entity represents a boss, false otherwise
-     */
-    public static boolean isCustomBossEntity(Entity entity) {
-        //TODO: Finish this method
-        return false;
-    }
-
-    public static void addCustomEntity(Entity entity) {
-        if (!customEntitiesEnabled) {
-            return;
-        }
-
-        File entityFile = CustomEntityConfig.getInstance().getFile();
-        YamlConfiguration entitiesFile = YamlConfiguration.loadConfiguration(entityFile);
-
-        String entityName = entity.getType().toString();
-        String sanitizedEntityName = entityName.replace(".", "_");
-
-        if (entitiesFile.getKeys(false).contains(sanitizedEntityName)) {
-            return;
-        }
-
-        entitiesFile.set(sanitizedEntityName + ".XP_Multiplier", 1.0D);
-        entitiesFile.set(sanitizedEntityName + ".Tameable", false);
-        entitiesFile.set(sanitizedEntityName + ".Taming_XP", 0);
-        entitiesFile.set(sanitizedEntityName + ".CanBeSummoned", false);
-        entitiesFile.set(sanitizedEntityName + ".COTW_Material", "");
-        entitiesFile.set(sanitizedEntityName + ".COTW_Material_Data", 0);
-        entitiesFile.set(sanitizedEntityName + ".COTW_Material_Amount", 0);
-
-        String className = "";
-
-        try {
-            className = ((Class<?>) entity.getClass().getDeclaredField("entityClass").get(entity)).getName();
-        }
-        catch (Exception e) {
-            if (e instanceof NoSuchFieldException || e instanceof IllegalArgumentException || e instanceof IllegalAccessException) {
-                className = entity.getClass().getName();
-            }
-            else {
-                e.printStackTrace();
-            }
-        }
-
-        CustomEntityConfig.getInstance().addEntity(new CustomEntity(1.0D, false, 0, false, null, 0), className, entityName);
-
-        try {
-            entitiesFile.save(entityFile);
-            mcMMO.p.debug(entity.getType().toString() + " was added to the custom entities file!");
-        }
-        catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-}

src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java

@@ -191,10 +191,10 @@ public final class CommandUtils {
 
     public static String displaySkill(PlayerProfile profile, SkillType skill) {
         if (skill.isChildSkill()) {
-            return LocaleLoader.getString("Skills.ChildStats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener"), " ", profile.getSkillLevel(skill));
+            return LocaleLoader.getString("Skills.ChildStats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener") + " ", profile.getSkillLevel(skill));
         }
 
-        return LocaleLoader.getString("Skills.Stats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener"), " ", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill));
+        return LocaleLoader.getString("Skills.Stats", LocaleLoader.getString(StringUtils.getCapitalized(skill.toString()) + ".Listener") + " ", profile.getSkillLevel(skill), profile.getSkillXpLevel(skill), profile.getXpToLevel(skill));
     }
 
     private static void printGroupedSkillData(Player inspect, CommandSender display, String header, List<SkillType> skillGroup) {

src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java

@@ -39,7 +39,6 @@ import com.gmail.nossr50.util.EventUtils;
 import com.gmail.nossr50.util.ItemUtils;
 import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.MobHealthbarUtils;
-import com.gmail.nossr50.util.ModUtils;
 import com.gmail.nossr50.util.Permissions;
 import com.gmail.nossr50.util.player.UserManager;
 
@@ -421,8 +420,8 @@ public final class CombatUtils {
             }
         }
         else {
-            if (ModUtils.isCustomEntity(target)) {
-                baseXP = ModUtils.getCustomEntity(target).getXpMultiplier();
+            if (mcMMO.getModManager().isCustomEntity(target)) {
+                baseXP = mcMMO.getModManager().getEntity(target).getXpMultiplier();
             }
             else if (target instanceof Animals) {
                 baseXP = ExperienceConfig.getInstance().getAnimalsXP();
@@ -473,7 +472,7 @@ public final class CombatUtils {
 
                     default:
                         baseXP = 1.0;
-                        ModUtils.addCustomEntity(target);
+                        mcMMO.getModManager().addCustomEntity(target);
                         break;
                 }
             }
@@ -609,8 +608,8 @@ public final class CombatUtils {
         else if (ItemUtils.isDiamondTool(inHand)) {
             tier = 4;
         }
-        else if (ModUtils.isCustomTool(inHand)) {
-            tier = ModUtils.getToolFromItemStack(inHand).getTier();
+        else if (mcMMO.getModManager().isCustomTool(inHand)) {
+            tier = mcMMO.getModManager().getTool(inHand).getTier();
         }
 
         return tier;

src/main/resources/potions.yml

@@ -66,7 +66,7 @@ Potions:
     0: # Water Bottle
         Children:
             BLAZE_POWDER: 8192          # Mundane Potion
-            FERMENTED_SPIDER_EYE: 4616  # Potion of Weakness
+            FERMENTED_SPIDER_EYE: 8200  # Potion of Weakness
             GHAST_TEAR: 8192            # Mundane Potion
             GLOWSTONE_DUST: 32          # Thick Potion
             MAGMA_CREAM: 8192           # Mundane Potion
@@ -79,73 +79,72 @@ Potions:
     16: # Awkward Potion
         Children:
             APPLE: 5376                 # Potion of Health Boost
-            BLAZE_POWDER: 1289          # Potion of Strength
+            BLAZE_POWDER: 8201          # Potion of Strength
             BROWN_MUSHROOM: 2304        # Potion of Nausea
             CARROT_ITEM: 768            # Potion of Haste
-            FERMENTED_SPIDER_EYE: 4616  # Potion of Weakness
-            GHAST_TEAR: 2561            # Potion of Regeneration
+            FERMENTED_SPIDER_EYE: 8200  # Potion of Weakness
+            GHAST_TEAR: 8193            # Potion of Regeneration
             'GOLDEN_APPLE:0': 2816      # Potion of Resistance
-            GOLDEN_CARROT: 4102         # Potion of Night Vision
+            GOLDEN_CARROT: 8198         # Potion of Night Vision
             'INK_SACK:0': 3840          # Potion of Blindness
             'LONG_GRASS:2': 5888        # Potion of Saturation
-            MAGMA_CREAM: 3075           # Potion of Fire Resistance
+            MAGMA_CREAM: 8195           # Potion of Fire Resistance
             POISONOUS_POTATO: 5120      # Potion of Decay
             QUARTZ: 5632                # Potion of Absorption
             RED_MUSHROOM: 2048          # Potion of Leaping
             ROTTEN_FLESH: 4352          # Potion of Hunger
             SLIME_BALL: 1024            # Potion of Dullness
-            SPECKLED_MELON: 1541        # Potion of Healing
-            SPIDER_EYE: 4868            # Potion of Poison
-            SUGAR: 258                  # Potion of Swiftness
-            WATER_LILY: 3341            # Potion of Water Breathing (Minecraft 1.6)
-            'RAW_FISH:3': 3341          # Potion of Water Breathing (Minecraft 1.7)
+            SPECKLED_MELON: 8197        # Potion of Healing
+            SPIDER_EYE: 8196            # Potion of Poison
+            SUGAR: 8194                 # Potion of Swiftness
+            WATER_LILY: 8205            # Potion of Water Breathing (Minecraft 1.6)
+            'RAW_FISH:3': 8205          # Potion of Water Breathing (Minecraft 1.7)
 
     32: # Thick Potion
         Children:
-            FERMENTED_SPIDER_EYE: 4616
+            FERMENTED_SPIDER_EYE: 8200
 
     64: # Mundane Potion Extended
         Children:
-            FERMENTED_SPIDER_EYE: 4680
+            FERMENTED_SPIDER_EYE: 8264
 
     8192: # Mundane Potion
         Children:
-            FERMENTED_SPIDER_EYE: 4616
+            FERMENTED_SPIDER_EYE: 8200
             SULPHUR: 16384
 
     ### DRINKABLE POTIONS ######################################################
 
-    258: # Potion of Swiftness
+    8194: # Potion of Swiftness
         Effects: ["SPEED 0 3600"]        
         Children:
-            FERMENTED_SPIDER_EYE: 522
-            GLOWSTONE_DUST: 290
-            REDSTONE: 322
-            SULPHUR: 16642
-    290: # Potion of Swiftness II
+            FERMENTED_SPIDER_EYE: 8202
+            GLOWSTONE_DUST: 8226
+            REDSTONE: 8258
+            SULPHUR: 16386
+    8226: # Potion of Swiftness II
         Effects: ["SPEED 1 1800"]        
         Children:
-            FERMENTED_SPIDER_EYE: 586
-            REDSTONE: 322
-            SULPHUR: 16642
-    322: # Potion of Swiftness Extended
+            FERMENTED_SPIDER_EYE: 8266
+            REDSTONE: 8258
+            SULPHUR: 16418
+    8258: # Potion of Swiftness Extended
         Effects: ["SPEED 0 9600"]        
         Children:
-            FERMENTED_SPIDER_EYE: 522
-            GLOWSTONE_DUST: 290
-            SULPHUR: 16706
+            FERMENTED_SPIDER_EYE: 8202
+            GLOWSTONE_DUST: 8226
+            SULPHUR: 16450
 
-    522: # Potion of Slowness
+    8202: # Potion of Slowness
         Effects: ["SLOW 0 1800"]        
         Children:
-            REDSTONE: 586
-            SULPHUR: 16906
-    586: # Potion of Slowness Extended
+            REDSTONE: 8266
+            SULPHUR: 16394
+    8266: # Potion of Slowness Extended
         Effects: ["SLOW 0 4800"]        
         Children:
-            GLOWSTONE_DUST: 522
-            SULPHUR: 16970
-
+            GLOWSTONE_DUST: 8202
+            SULPHUR: 16458
 
     768: # Potion of Haste
         Effects: ["FAST_DIGGING 0 3600"]        
@@ -183,49 +182,49 @@ Potions:
             GLOWSTONE_DUST: 1056
             SULPHUR: 17472
 
-    1289: # Potion of Strength
+    8201: # Potion of Strength
         Effects: ["INCREASE_DAMAGE 0 3600"]
         Children:
-            FERMENTED_SPIDER_EYE: 4616
-            GLOWSTONE_DUST: 1321
-            REDSTONE: 1353
-            SULPHUR: 17673
-    1321: # Potion of Strength II
+            FERMENTED_SPIDER_EYE: 8200
+            GLOWSTONE_DUST: 8233
+            REDSTONE: 8265
+            SULPHUR: 16393
+    8233: # Potion of Strength II
         Effects: ["INCREASE_DAMAGE 1 1800"]
         Children:
-            FERMENTED_SPIDER_EYE: 4616
-            REDSTONE: 1353
-            SULPHUR: 17705
-    1353: # Potion of Strength Extended
+            FERMENTED_SPIDER_EYE: 8200
+            REDSTONE: 8265
+            SULPHUR: 16425
+    8265: # Potion of Strength Extended
         Effects: ["INCREASE_DAMAGE 0 9600"]
         Children:
-            FERMENTED_SPIDER_EYE: 4680
-            GLOWSTONE_DUST: 1321
-            SULPHUR: 17737
+            FERMENTED_SPIDER_EYE: 8264
+            GLOWSTONE_DUST: 8233
+            SULPHUR: 16457
 
-    1541: # Potion of Healing
+    8197: # Potion of Healing
         Effects: ["HEAL 0"]
         Children:
-            FERMENTED_SPIDER_EYE: 1804
-            GLOWSTONE_DUST: 1573
-            SULPHUR: 17925
-    1573: # Potion of Healing II
+            FERMENTED_SPIDER_EYE: 8204
+            GLOWSTONE_DUST: 8229
+            SULPHUR: 16389
+    8229: # Potion of Healing II
         Effects: ["HEAL 1"]
         Children:
-            FERMENTED_SPIDER_EYE: 1836
-            REDSTONE: 1541
-            SULPHUR: 17957
+            FERMENTED_SPIDER_EYE: 8236
+            REDSTONE: 8197
+            SULPHUR: 16421
 
-    1804: # Potion of Harming
+    8204: # Potion of Harming
         Effects: ["HARM 0"]
         Children:
-            GLOWSTONE_DUST: 1836
-            SULPHUR: 18188
-    1836: # Potion of Harming II
+            GLOWSTONE_DUST: 8236
+            SULPHUR: 16396
+    8236: # Potion of Harming II
         Effects: ["HARM 1"]
         Children:
-            REDSTONE: 1804
-            SULPHUR: 18220
+            REDSTONE: 8204
+            SULPHUR: 16428
 
     2048: # Potion of Leaping
         Effects: ["JUMP 0 3600"]
@@ -255,25 +254,25 @@ Potions:
             GLOWSTONE_DUST: 2304
             SULPHUR: 18752
 
-    2561: # Potion of Regeneration
+    8193: # Potion of Regeneration
         Effects: ["REGENERATION 0 900"]
         Children:
-            FERMENTED_SPIDER_EYE: 4616
-            GLOWSTONE_DUST: 2593
-            REDSTONE: 2625
-            SULPHUR: 18945
-    2593: # Potion of Regeneration II
+            FERMENTED_SPIDER_EYE: 8200
+            GLOWSTONE_DUST: 8225
+            REDSTONE: 8257
+            SULPHUR: 16385
+    8225: # Potion of Regeneration II
         Effects: ["REGENERATION 1 450"]
         Children:
-            FERMENTED_SPIDER_EYE: 4616
-            REDSTONE: 2625
-            SULPHUR: 18977
-    2625: # Potion of Regeneration Extended
+            FERMENTED_SPIDER_EYE: 8200
+            REDSTONE: 8257
+            SULPHUR: 16417
+    8257: # Potion of Regeneration Extended
         Effects: ["REGENERATION 0 2400"]
         Children:
-            FERMENTED_SPIDER_EYE: 4680
-            GLOWSTONE_DUST: 2593
-            SULPHUR: 19009
+            FERMENTED_SPIDER_EYE: 8264
+            GLOWSTONE_DUST: 8225
+            SULPHUR: 16449
 
     2816: # Potion of Resistance
         Effects: ["DAMAGE_RESISTANCE 0 450"]
@@ -292,40 +291,40 @@ Potions:
             GLOWSTONE_DUST: 2848
             SULPHUR: 19264
 
-    3075: # Potion of Fire Resistance
+    8195: # Potion of Fire Resistance
         Effects: ["FIRE_RESISTANCE 0 3600"]
         Children:
-            FERMENTED_SPIDER_EYE: 522
+            FERMENTED_SPIDER_EYE: 8202
             REDSTONE: 3139
-            SULPHUR: 19459
+            SULPHUR: 16387
     3139: # Potion of Fire Resistance Extended
         Effects: ["FIRE_RESISTANCE 0 9600"]
         Children:
-            FERMENTED_SPIDER_EYE: 586
-            GLOWSTONE_DUST: 3075
-            SULPHUR: 19523
+            FERMENTED_SPIDER_EYE: 8266
+            GLOWSTONE_DUST: 8195
+            SULPHUR: 16451
 
-    3341: # Potion of Water Breathing
+    8205: # Potion of Water Breathing
         Effects: ["WATER_BREATHING 0 3600"]
         Children:
             REDSTONE: 3405
-            SULPHUR: 19725
+            SULPHUR: 16397
     3405: # Potion of Water Breathing Extended
         Effects: ["WATER_BREATHING 0 9600"]
         Children:
-            GLOWSTONE_DUST: 3341
-            SULPHUR: 19789
+            GLOWSTONE_DUST: 8205
+            SULPHUR: 16461
 
     3598: # Potion of Invisibility
         Effects: ["INVISIBILITY 0 3600"]
         Children:
             REDSTONE: 3662
-            SULPHUR: 19982
+            SULPHUR: 16398
     3662: # Potion of Invisibility Extended
         Effects: ["INVISIBILITY 0 9600"]
         Children:
             GLOWSTONE_DUST: 3598
-            SULPHUR: 20046
+            SULPHUR: 16462
 
     3840: # Potion of Blindness
         Effects: ["BLINDNESS 0 225"]
@@ -338,18 +337,18 @@ Potions:
             GLOWSTONE_DUST: 3840
             SULPHUR: 20288
 
-    4102: # Potion of Night Vision
+    8198: # Potion of Night Vision
         Effects: ["NIGHT_VISION 0 3600"]
         Children:
             FERMENTED_SPIDER_EYE: 3598
             REDSTONE: 4166
-            SULPHUR: 20486
+            SULPHUR: 16390
     4166: # Potion of Night Vision Extended
         Effects: ["NIGHT_VISION 0 9600"]
         Children:
             FERMENTED_SPIDER_EYE: 3662
-            GLOWSTONE_DUST: 4102
-            SULPHUR: 20550
+            GLOWSTONE_DUST: 8198
+            SULPHUR: 16454
 
     4352: # Potion of Hunger
         Effects: ["HUNGER 0 900"]
@@ -368,36 +367,36 @@ Potions:
             GLOWSTONE_DUST: 4384
             SULPHUR: 20800
 
-    4616: # Potion of Weakness
+    8200: # Potion of Weakness
         Effects: ["WEAKNESS 0 1800"]
         Children:
-            REDSTONE: 4680
-            SULPHUR: 21000
-    4680: # Potion of Weakness Extended
+            REDSTONE: 8264
+            SULPHUR: 16392
+    8264: # Potion of Weakness Extended
         Effects: ["WEAKNESS 0 4800"]
         Children:
-            GLOWSTONE_DUST: 4616
-            SULPHUR: 21064
+            GLOWSTONE_DUST: 8200
+            SULPHUR: 16456
 
-    4868: # Potion of Poison
+    8196: # Potion of Poison
         Effects: ["POISON 0 900"]
         Children:
-            FERMENTED_SPIDER_EYE: 1804
-            GLOWSTONE_DUST: 4900
-            REDSTONE: 4932
-            SULPHUR: 21252
-    4900: # Potion of Poison II
+            FERMENTED_SPIDER_EYE: 8204
+            GLOWSTONE_DUST: 8228
+            REDSTONE: 8260
+            SULPHUR: 16388
+    8228: # Potion of Poison II
         Effects: ["POISON 1 450"]
         Children:
-            FERMENTED_SPIDER_EYE: 1836
-            REDSTONE: 4932
-            SULPHUR: 21284
-    4932: # Potion of Poison Extended
+            FERMENTED_SPIDER_EYE: 8236
+            REDSTONE: 8260
+            SULPHUR: 16452
+    8260: # Potion of Poison Extended
         Effects: ["POISON 0 2400"]
         Children:
-            FERMENTED_SPIDER_EYE: 1804
-            GLOWSTONE_DUST: 4900
-            SULPHUR: 21284
+            FERMENTED_SPIDER_EYE: 8204
+            GLOWSTONE_DUST: 8228
+            SULPHUR: 16452
 
     5120: # Potion of Decay
         Effects: ["WITHER 0 450"]
@@ -465,33 +464,33 @@ Potions:
 
     16384: # Splash Mundane Potion
         Children:
-            FERMENTED_SPIDER_EYE: 21000
+            FERMENTED_SPIDER_EYE: 16392
 
-    16642: # Splash Potion of Swiftness
+    16386: # Splash Potion of Swiftness
         Effects: ["SPEED 0 2700"]
         Children:
-            FERMENTED_SPIDER_EYE: 16906
-            GLOWSTONE_DUST: 16674
-            REDSTONE: 16706
-    16674: # Splash Potion of Swiftness II
+            FERMENTED_SPIDER_EYE: 16394
+            GLOWSTONE_DUST: 16418
+            REDSTONE: 16450
+    16418: # Splash Potion of Swiftness II
         Effects: ["SPEED 1 1350"]
         Children:
-            FERMENTED_SPIDER_EYE: 16906
-            REDSTONE: 16706
-    16706: # Splash Potion of Swiftness Extended
+            FERMENTED_SPIDER_EYE: 16394
+            REDSTONE: 16450
+    16450: # Splash Potion of Swiftness Extended
         Effects: ["SPEED 0 7200"]
         Children:
-            FERMENTED_SPIDER_EYE: 16906
-            GLOWSTONE_DUST: 16674
+            FERMENTED_SPIDER_EYE: 16394
+            GLOWSTONE_DUST: 16418
 
-    16906: # Splash Potion of Slowness
+    16394: # Splash Potion of Slowness
         Effects: ["SLOW 0 1350"]
         Children:
-            REDSTONE: 16970
-    16970: # Splash Potion of Slowness Extended
+            REDSTONE: 16458
+    16458: # Splash Potion of Slowness Extended
         Effects: ["SLOW 0 3600"]
         Children:
-            GLOWSTONE_DUST: 16906
+            GLOWSTONE_DUST: 16394
 
     17152: # Splash Potion of Haste
         Effects: ["FAST_DIGGING 0 2700"]
@@ -521,42 +520,42 @@ Potions:
         Children:
             GLOWSTONE_DUST: 17440
 
-    17673: # Splash Potion of Strength
+    16393: # Splash Potion of Strength
         Effects: ["INCREASE_DAMAGE 0 2700"]
         Children:
-            FERMENTED_SPIDER_EYE: 21000
-            GLOWSTONE_DUST: 17705
-            REDSTONE: 17737
-    17705: # Splash Potion of Strength II
+            FERMENTED_SPIDER_EYE: 16392
+            GLOWSTONE_DUST: 16425
+            REDSTONE: 16457
+    16425: # Splash Potion of Strength II
         Effects: ["INCREASE_DAMAGE 1 1350"]
         Children:
-            FERMENTED_SPIDER_EYE: 21000
-            REDSTONE: 17737
-    17737: # Splash Potion of Strength Extended
+            FERMENTED_SPIDER_EYE: 16392
+            REDSTONE: 16457
+    16457: # Splash Potion of Strength Extended
         Effects: ["INCREASE_DAMAGE 0 7200"]
         Children:
-            FERMENTED_SPIDER_EYE: 21064
-            GLOWSTONE_DUST: 17705
+            FERMENTED_SPIDER_EYE: 16456
+            GLOWSTONE_DUST: 16425
 
-    17925: # Splash Potion of Healing
+    16389: # Splash Potion of Healing
         Effects: ["HEAL 0"]
         Children:
-            FERMENTED_SPIDER_EYE: 18188
-            GLOWSTONE_DUST: 17957
-    17957: # Splash Potion of Healing II
+            FERMENTED_SPIDER_EYE: 16396
+            GLOWSTONE_DUST: 16421
+    16421: # Splash Potion of Healing II
         Effects: ["HEAL 1"]
         Children:
-            FERMENTED_SPIDER_EYE: 18220
-            REDSTONE: 17925
+            FERMENTED_SPIDER_EYE: 16428
+            REDSTONE: 16389
 
-    18188: # Splash Potion of Harming
+    16396: # Splash Potion of Harming
         Effects: ["HARM 0"]
         Children:
-            GLOWSTONE_DUST: 18220
-    18220: # Splash Potion of Harming II
+            GLOWSTONE_DUST: 16428
+    16428: # Splash Potion of Harming II
         Effects: ["HARM 1"]
         Children:
-            REDSTONE: 18188
+            REDSTONE: 16396
 
     18432: # Splash Potion of Leaping
         Effects: ["JUMP 0 2700"]
@@ -581,22 +580,22 @@ Potions:
         Children:
             GLOWSTONE_DUST: 18688
 
-    18945: # Splash Potion of Regeneration
+    16385: # Splash Potion of Regeneration
         Effects: ["REGENERATION 0 675"]
         Children:
-            FERMENTED_SPIDER_EYE: 21000
-            GLOWSTONE_DUST: 18977
-            REDSTONE: 19009
-    18977: # Splash Potion of Regeneration II
+            FERMENTED_SPIDER_EYE: 16392
+            GLOWSTONE_DUST: 16417
+            REDSTONE: 16449
+    16417: # Splash Potion of Regeneration II
         Effects: ["REGENERATION 1 338"]
         Children:
-            FERMENTED_SPIDER_EYE: 21000
-            REDSTONE: 19009
-    19009: # Splash Potion of Regeneration Extended
+            FERMENTED_SPIDER_EYE: 16392
+            REDSTONE: 16449
+    16449: # Splash Potion of Regeneration Extended
         Effects: ["REGENERATION 0 1800"]
         Children:
-            FERMENTED_SPIDER_EYE: 21064
-            GLOWSTONE_DUST: 18977
+            FERMENTED_SPIDER_EYE: 16456
+            GLOWSTONE_DUST: 16417
 
     19200: # Splash Potion of Resistance
         Effects: ["DAMAGE_RESISTANCE 0 338"]
@@ -612,34 +611,34 @@ Potions:
         Children:
             GLOWSTONE_DUST: 19232
 
-    19459: # Splash Potion of Fire Resistance
+    16387: # Splash Potion of Fire Resistance
         Effects: ["FIRE_RESISTANCE 0 2700"]
         Children:
-            FERMENTED_SPIDER_EYE: 16906
-            REDSTONE: 19523
-    19523: # Splash Potion of Fire Resistance Extended
+            FERMENTED_SPIDER_EYE: 16394
+            REDSTONE: 16451
+    16451: # Splash Potion of Fire Resistance Extended
         Effects: ["FIRE_RESISTANCE 0 7200"]
         Children:
-            FERMENTED_SPIDER_EYE: 16970
-            GLOWSTONE_DUST: 19459
+            FERMENTED_SPIDER_EYE: 16458
+            GLOWSTONE_DUST: 16387
 
-    19725: # Splash Potion of Water Breathing
+    16397: # Splash Potion of Water Breathing
         Effects: ["WATER_BREATHING 0 2700"]
         Children:
-            REDSTONE: 19789
-    19789: # Splash Potion of Water Breathing Extended
+            REDSTONE: 16461
+    16461: # Splash Potion of Water Breathing Extended
         Effects: ["WATER_BREATHING 0 7200"]
         Children:
-            GLOWSTONE_DUST: 19725
+            GLOWSTONE_DUST: 16397
 
-    19982: # Splash Potion of Invisibility
+    16398: # Splash Potion of Invisibility
         Effects: ["INVISIBILITY 0 2700"]
         Children:
-            REDSTONE: 20046
-    20046: # Splash Potion of Invisibility Extended
+            REDSTONE: 16462
+    16462: # Splash Potion of Invisibility Extended
         Effects: ["INVISIBILITY 0 7200"]
         Children:
-            GLOWSTONE_DUST: 19982
+            GLOWSTONE_DUST: 16398
 
     20224: # Splash Potion of Blindness
         Effects: ["BLINDNESS 0 169"]
@@ -650,16 +649,16 @@ Potions:
         Children:
             GLOWSTONE_DUST: 20224
 
-    20486: # Splash Potion of Night Vision
+    16390: # Splash Potion of Night Vision
         Effects: ["NIGHT_VISION 0 2700"]
         Children:
-            FERMENTED_SPIDER_EYE: 19982
-            REDSTONE: 20550
-    20550: # Splash Potion of Night Vision Extended
+            FERMENTED_SPIDER_EYE: 16398
+            REDSTONE: 16454
+    16454: # Splash Potion of Night Vision Extended
         Effects: ["NIGHT_VISION 0 7200"]
         Children:
-            FERMENTED_SPIDER_EYE: 20046
-            GLOWSTONE_DUST: 20486
+            FERMENTED_SPIDER_EYE: 16462
+            GLOWSTONE_DUST: 16390
 
     20736: # Splash Potion of Hunger
         Effects: ["HUNGER 0 675"]
@@ -675,31 +674,31 @@ Potions:
         Children:
             GLOWSTONE_DUST: 20768
 
-    21000: # Splash Potion of Weakness
+    16392: # Splash Potion of Weakness
         Effects: ["WEAKNESS 0 1350"]
         Children:
-            REDSTONE: 21064
-    21064: # Splash Potion of Weakness Extended
+            REDSTONE: 16456
+    16456: # Splash Potion of Weakness Extended
         Effects: ["WEAKNESS 0 3600"]
         Children:
-            GLOWSTONE_DUST: 21000
+            GLOWSTONE_DUST: 16392
 
-    21252: # Splash Potion of Poison
+    16388: # Splash Potion of Poison
         Effects: ["POISON 0 675"]
         Children:
-            FERMENTED_SPIDER_EYE: 18188
-            GLOWSTONE_DUST: 21284
-            REDSTONE: 21316
-    21284: # Splash Potion of Poison II
+            FERMENTED_SPIDER_EYE: 16396
+            GLOWSTONE_DUST: 16452
+            REDSTONE: 16452
+    16452: # Splash Potion of Poison II
         Effects: ["POISON 1 338"]
         Children:
-            FERMENTED_SPIDER_EYE: 18220
-            REDSTONE: 21316
-    21316: # Splash Potion of Poison Extended
+            FERMENTED_SPIDER_EYE: 16428
+            REDSTONE: 16452
+    16452: # Splash Potion of Poison Extended
         Effects: ["POISON 0 1800"]
         Children:
-            FERMENTED_SPIDER_EYE: 18188
-            GLOWSTONE_DUST: 21284
+            FERMENTED_SPIDER_EYE: 16396
+            GLOWSTONE_DUST: 16452
 
     21504: # Splash Potion of Decay
         Effects: ["WITHER 0 338"]