Made mod config files modular. Addresses #1802

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/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;