optimizations

src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java

@@ -376,6 +376,7 @@ public class ExperienceConfig extends BukkitConfig {
         return getXp(skill, material) > 0;
     }
 
+    @Deprecated(forRemoval = true, since = "2.2.024")
     public boolean doesBlockGiveSkillXP(PrimarySkillType skill, BlockData data) {
         return getXp(skill, data) > 0;
     }

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

@@ -1,35 +0,0 @@
-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(vanilla.getParentFile().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 CustomArmorLegacyConfig(fileName));
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-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(vanilla.getParentFile().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 CustomBlockLegacyConfig(fileName));
-        }
-    }
-}

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

@@ -1,93 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import com.gmail.nossr50.config.LegacyConfigLoader;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
-import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-
-public class CustomArmorLegacyConfig extends LegacyConfigLoader {
-    public List<Material> customBoots = new ArrayList<>();
-    public List<Material> customChestplates = new ArrayList<>();
-    public List<Material> customHelmets = new ArrayList<>();
-    public List<Material> customLeggings = new ArrayList<>();
-    public List<Repairable> repairables = new ArrayList<>();
-    private boolean needsUpdate = false;
-
-    protected CustomArmorLegacyConfig(String fileName) {
-        super("mods", fileName);
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        loadArmor("Boots", customBoots);
-        loadArmor("Chestplates", customChestplates);
-        loadArmor("Helmets", customHelmets);
-        loadArmor("Leggings", customLeggings);
-
-        if (needsUpdate) {
-            needsUpdate = false;
-            backup();
-        }
-    }
-
-    private void loadArmor(String armorType, List<Material> materialList) {
-        if (needsUpdate) {
-            return;
-        }
-
-        ConfigurationSection armorSection = config.getConfigurationSection(armorType);
-
-        if (armorSection == null) {
-            return;
-        }
-
-        Set<String> armorConfigSet = armorSection.getKeys(false);
-
-        for (String armorName : armorConfigSet) {
-            if (config.contains(armorType + "." + armorName + "." + ".ID")) {
-                needsUpdate = true;
-                return;
-            }
-
-            Material armorMaterial = Material.matchMaterial(armorName);
-
-            if (armorMaterial == null) {
-                mcMMO.p.getLogger().warning("Invalid material name. This item will be skipped. - " + armorName);
-                continue;
-            }
-
-            boolean repairable = config.getBoolean(armorType + "." + armorName + ".Repairable");
-            Material repairMaterial = Material.matchMaterial(config.getString(armorType + "." + armorName + ".Repair_Material", ""));
-
-            if (repairable && (repairMaterial == null)) {
-                mcMMO.p.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + armorName);
-                repairable = false;
-            }
-
-            if (repairable) {
-                String repairItemName = config.getString(armorType + "." + armorName + ".Repair_Material_Pretty_Name");
-                int repairMinimumLevel = config.getInt(armorType + "." + armorName + ".Repair_MinimumLevel", 0);
-                double repairXpMultiplier = config.getDouble(armorType + "." + armorName + ".Repair_XpMultiplier", 1);
-
-                short durability = armorMaterial.getMaxDurability();
-
-                if (durability == 0) {
-                    durability = (short) config.getInt(armorType + "." + armorName + ".Durability", 70);
-                }
-
-                repairables.add(RepairableFactory.getRepairable(armorMaterial, repairMaterial, repairItemName, repairMinimumLevel, durability, ItemType.ARMOR, MaterialType.OTHER, repairXpMultiplier));
-            }
-
-            materialList.add(armorMaterial);
-        }
-    }
-}

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

@@ -1,98 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import com.gmail.nossr50.config.LegacyConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomBlock;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-public class CustomBlockLegacyConfig extends LegacyConfigLoader {
-    public List<Material> customExcavationBlocks = new ArrayList<>();
-    public List<Material> customHerbalismBlocks = new ArrayList<>();
-    public List<Material> customMiningBlocks = new ArrayList<>();
-    public List<Material> customOres = new ArrayList<>();
-    public List<Material> customLogs = new ArrayList<>();
-    public List<Material> customLeaves = new ArrayList<>();
-    public List<Material> customAbilityBlocks = new ArrayList<>();
-    public HashMap<Material, CustomBlock> customBlockMap = new HashMap<>();
-    private boolean needsUpdate = false;
-
-    protected CustomBlockLegacyConfig(String fileName) {
-        super("mods", fileName);
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        loadBlocks("Excavation", customExcavationBlocks);
-        loadBlocks("Herbalism", customHerbalismBlocks);
-        loadBlocks("Mining", customMiningBlocks);
-        loadBlocks("Woodcutting", null);
-        loadBlocks("Ability_Blocks", customAbilityBlocks);
-
-        if (needsUpdate) {
-            needsUpdate = false;
-            backup();
-        }
-    }
-
-    private void loadBlocks(String skillType, List<Material> blockList) {
-        if (needsUpdate) {
-            return;
-        }
-
-        ConfigurationSection skillSection = config.getConfigurationSection(skillType);
-
-        if (skillSection == null) {
-            return;
-        }
-
-        Set<String> skillConfigSet = skillSection.getKeys(false);
-
-        for (String blockName : skillConfigSet) {
-            if (config.contains(skillType + "." + blockName + ".Drop_Item")) {
-                needsUpdate = true;
-                return;
-            }
-
-            String[] blockInfo = blockName.split("[|]");
-
-            Material blockMaterial = Material.matchMaterial(blockInfo[0]);
-
-            if (blockMaterial == null) {
-                mcMMO.p.getLogger().warning("Invalid material name. This item will be skipped. - " + blockInfo[0]);
-                continue;
-            }
-
-            if (blockList != null) {
-                blockList.add(blockMaterial);
-            }
-
-            if (skillType.equals("Ability_Blocks")) {
-                continue;
-            }
-
-            int xp = config.getInt(skillType + "." + blockName + ".XP_Gain");
-            int smeltingXp = 0;
-
-            if (skillType.equals("Mining") && config.getBoolean(skillType + "." + blockName + ".Is_Ore")) {
-                customOres.add(blockMaterial);
-                smeltingXp = config.getInt(skillType + "." + blockName + ".Smelting_XP_Gain", xp / 10);
-            } else if (skillType.equals("Woodcutting")) {
-                if (config.getBoolean(skillType + "." + blockName + ".Is_Log")) {
-                    customLogs.add(blockMaterial);
-                } else {
-                    customLeaves.add(blockMaterial);
-                    xp = 0; // Leaves don't grant XP
-                }
-            }
-
-            customBlockMap.put(blockMaterial, new CustomBlock(xp, config.getBoolean(skillType + "." + blockName + ".Double_Drops_Enabled"), smeltingXp));
-        }
-    }
-}

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

@@ -1,60 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import com.gmail.nossr50.config.LegacyConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomEntity;
-import com.gmail.nossr50.mcMMO;
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.HashMap;
-
-public class CustomEntityLegacyConfig extends LegacyConfigLoader {
-    public HashMap<String, CustomEntity> customEntityClassMap = new HashMap<>();
-    public HashMap<String, CustomEntity> customEntityTypeMap = new HashMap<>();
-
-    protected CustomEntityLegacyConfig(String fileName) {
-        super("mods", fileName);
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        if (config.getConfigurationSection("Hostile") != null) {
-            backup();
-            return;
-        }
-
-        for (String entityName : config.getKeys(false)) {
-            Class<?> clazz = null;
-            String className = config.getString(entityName + ".Class", "");
-
-            try {
-                clazz = Class.forName(className);
-            } catch (ClassNotFoundException e) {
-                mcMMO.p.getLogger().warning("Invalid class (" + className + ") detected for " + entityName + ".");
-                mcMMO.p.getLogger().warning("This custom entity may not function properly.");
-            }
-
-            String entityTypeName = entityName.replace("_", ".");
-            double xpMultiplier = config.getDouble(entityName + ".XP_Multiplier", 1.0D);
-
-            boolean canBeTamed = config.getBoolean(entityName + ".Tameable");
-            int tamingXp = config.getInt(entityName + ".Taming_XP");
-
-            boolean canBeSummoned = config.getBoolean(entityName + ".CanBeSummoned");
-            Material callOfTheWildMaterial = Material.matchMaterial(config.getString(entityName + ".COTW_Material", ""));
-            byte callOfTheWildData = (byte) config.getInt(entityName + ".COTW_Material_Data");
-            int callOfTheWildAmount = config.getInt(entityName + ".COTW_Material_Amount");
-
-            if (canBeSummoned && (callOfTheWildMaterial == null || callOfTheWildAmount == 0)) {
-                mcMMO.p.getLogger().warning("Incomplete Call of the Wild information. This entity will not be able to be summoned by Call of the Wild.");
-                canBeSummoned = false;
-            }
-
-            CustomEntity entity = new CustomEntity(xpMultiplier, canBeTamed, tamingXp, canBeSummoned, (canBeSummoned ? new ItemStack(callOfTheWildMaterial) : null), callOfTheWildAmount);
-
-            customEntityTypeMap.put(entityTypeName, entity);
-            customEntityClassMap.put(clazz == null ? null : clazz.getName(), entity);
-        }
-    }
-}

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

@@ -1,107 +0,0 @@
-package com.gmail.nossr50.config.mods;
-
-import com.gmail.nossr50.config.LegacyConfigLoader;
-import com.gmail.nossr50.datatypes.mods.CustomTool;
-import com.gmail.nossr50.datatypes.skills.ItemType;
-import com.gmail.nossr50.datatypes.skills.MaterialType;
-import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.skills.repair.repairables.Repairable;
-import com.gmail.nossr50.skills.repair.repairables.RepairableFactory;
-import org.bukkit.Material;
-import org.bukkit.configuration.ConfigurationSection;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-
-public class CustomToolLegacyConfig extends LegacyConfigLoader {
-    public List<Material> customAxes = new ArrayList<>();
-    public List<Material> customBows = new ArrayList<>();
-    public List<Material> customHoes = new ArrayList<>();
-    public List<Material> customPickaxes = new ArrayList<>();
-    public List<Material> customShovels = new ArrayList<>();
-    public List<Material> customSwords = new ArrayList<>();
-    public HashMap<Material, CustomTool> customToolMap = new HashMap<>();
-    public List<Repairable> repairables = new ArrayList<>();
-    private boolean needsUpdate = false;
-
-    protected CustomToolLegacyConfig(String fileName) {
-        super("mods", fileName);
-        loadKeys();
-    }
-
-    @Override
-    protected void loadKeys() {
-        loadTool("Axes", customAxes);
-        loadTool("Bows", customBows);
-        loadTool("Hoes", customHoes);
-        loadTool("Pickaxes", customPickaxes);
-        loadTool("Shovels", customShovels);
-        loadTool("Swords", customSwords);
-
-        if (needsUpdate) {
-            needsUpdate = false;
-            backup();
-        }
-    }
-
-    private void loadTool(String toolType, List<Material> materialList) {
-        if (needsUpdate) {
-            return;
-        }
-
-        ConfigurationSection toolSection = config.getConfigurationSection(toolType);
-
-        if (toolSection == null) {
-            return;
-        }
-
-        Set<String> toolConfigSet = toolSection.getKeys(false);
-
-        for (String toolName : toolConfigSet) {
-            if (config.contains(toolType + "." + toolName + "." + ".ID")) {
-                needsUpdate = true;
-                return;
-            }
-
-            Material toolMaterial = Material.matchMaterial(toolName);
-
-            if (toolMaterial == null) {
-                mcMMO.p.getLogger().warning("Invalid material name. This item will be skipped. - " + toolName);
-                continue;
-            }
-
-            boolean repairable = config.getBoolean(toolType + "." + toolName + ".Repairable");
-            Material repairMaterial = Material.matchMaterial(config.getString(toolType + "." + toolName + ".Repair_Material", ""));
-
-            if (repairable && (repairMaterial == null)) {
-                mcMMO.p.getLogger().warning("Incomplete repair information. This item will be unrepairable. - " + toolName);
-                repairable = false;
-            }
-
-            if (repairable) {
-                String repairItemName = config.getString(toolType + "." + toolName + ".Repair_Material_Pretty_Name");
-                int repairMinimumLevel = config.getInt(toolType + "." + toolName + ".Repair_MinimumLevel", 0);
-                double repairXpMultiplier = config.getDouble(toolType + "." + toolName + ".Repair_XpMultiplier", 1);
-
-                short durability = toolMaterial.getMaxDurability();
-
-                if (durability == 0) {
-                    durability = (short) config.getInt(toolType + "." + toolName + ".Durability", 60);
-                }
-
-                repairables.add(RepairableFactory.getRepairable(toolMaterial, repairMaterial, repairItemName, repairMinimumLevel, durability, ItemType.TOOL, MaterialType.OTHER, repairXpMultiplier));
-            }
-
-            double multiplier = config.getDouble(toolType + "." + toolName + ".XP_Modifier", 1.0);
-            boolean abilityEnabled = config.getBoolean(toolType + "." + toolName + ".Ability_Enabled", true);
-            int tier = config.getInt(toolType + "." + toolName + ".Tier", 1);
-
-            CustomTool tool = new CustomTool(tier, abilityEnabled, multiplier);
-
-            materialList.add(toolMaterial);
-            customToolMap.put(toolMaterial, tool);
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-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(vanilla.getParentFile().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 CustomEntityLegacyConfig(fileName));
-        }
-    }
-}

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

@@ -1,35 +0,0 @@
-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(vanilla.getParentFile().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 CustomToolLegacyConfig(fileName));
-        }
-    }
-}