diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java index 6694a388..21150194 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/EcoEnchantsPlugin.java @@ -11,9 +11,8 @@ import com.willfp.ecoenchants.command.commands.CommandEcoreload; import com.willfp.ecoenchants.command.commands.CommandEnchantinfo; import com.willfp.ecoenchants.command.commands.CommandRandomenchant; import com.willfp.ecoenchants.command.tabcompleters.TabCompleterEnchantinfo; -import com.willfp.ecoenchants.config.EcoEnchantsConfigs; -import com.willfp.ecoenchants.config.configs.RarityYml; -import com.willfp.ecoenchants.config.configs.TargetYml; +import com.willfp.ecoenchants.config.RarityYml; +import com.willfp.ecoenchants.config.TargetYml; import com.willfp.ecoenchants.display.EnchantDisplay; import com.willfp.ecoenchants.display.EnchantmentCache; import com.willfp.ecoenchants.enchantments.EcoEnchants; @@ -217,7 +216,6 @@ public class EcoEnchantsPlugin extends EcoPlugin { @Override public List> getUpdatableClasses() { return Arrays.asList( - EcoEnchantsConfigs.class, EnchantmentCache.class, EnchantmentRarity.class, EnchantmentTarget.class, diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java deleted file mode 100644 index c965f246..00000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.willfp.ecoenchants.config; - -import com.willfp.eco.core.config.ConfigUpdater; -import com.willfp.ecoenchants.config.configs.EnchantmentConfig; -import lombok.Getter; -import lombok.experimental.UtilityClass; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.Set; - -@UtilityClass -public class EcoEnchantsConfigs { - /** - * All enchantment-specific configs. - */ - @Getter - private final Set enchantmentConfigs = new HashSet<>(); - - /** - * Update all configs. - */ - @ConfigUpdater - public void updateConfigs() { - enchantmentConfigs.forEach(EnchantmentConfig::update); - } - - /** - * Get EnchantmentConfig matching permission name. - * - * @param permissionName The permission name to match. - * @return The matching {@link EnchantmentConfig}. - */ - public EnchantmentConfig getEnchantmentConfig(@NotNull final String permissionName) { - return enchantmentConfigs.stream().filter(config -> config.getName().equalsIgnoreCase(permissionName)).findFirst().orElse(null); - } - - /** - * Adds new enchantment config yml. - * - * @param config The config to add. - */ - public void addEnchantmentConfig(@NotNull final EnchantmentConfig config) { - enchantmentConfigs.add(config); - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentConfig.java similarity index 98% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentConfig.java index 8246705a..f91eb4e2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/EnchantmentConfig.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EnchantmentConfig.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.config.configs; +package com.willfp.ecoenchants.config; import com.willfp.eco.core.config.ExtendableConfig; import com.willfp.ecoenchants.EcoEnchantsPlugin; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/RarityYml.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/RarityYml.java similarity index 92% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/RarityYml.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/RarityYml.java index 34d9cf5a..86a63bac 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/RarityYml.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/RarityYml.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.config.configs; +package com.willfp.ecoenchants.config; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.BaseConfig; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/TargetYml.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/TargetYml.java similarity index 96% rename from eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/TargetYml.java rename to eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/TargetYml.java index ec111488..b32e51eb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/configs/TargetYml.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/TargetYml.java @@ -1,4 +1,4 @@ -package com.willfp.ecoenchants.config.configs; +package com.willfp.ecoenchants.config; import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.config.BaseConfig; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index 4ed159d0..cabe7d6e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -3,8 +3,7 @@ package com.willfp.ecoenchants.enchantments; import com.willfp.eco.core.Prerequisite; import com.willfp.eco.util.StringUtils; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.config.EcoEnchantsConfigs; -import com.willfp.ecoenchants.config.configs.EnchantmentConfig; +import com.willfp.ecoenchants.config.EnchantmentConfig; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; @@ -142,8 +141,7 @@ public abstract class EcoEnchant extends Enchantment implements Listener, Watche this.type = type; this.permissionName = key.replace("_", ""); - EcoEnchantsConfigs.addEnchantmentConfig(new EnchantmentConfig(this.permissionName, this.getClass(), this.type)); - this.config = EcoEnchantsConfigs.getEnchantmentConfig(this.permissionName); + this.config = new EnchantmentConfig(this.permissionName, this.getClass(), this.type); if (Bukkit.getPluginManager().getPermission("ecoenchants.fromtable." + permissionName) == null) { Permission permission = new Permission( diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java index a94be7c6..df8fa597 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.enchantments.meta; import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.eco.util.StringUtils; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.config.configs.RarityYml; +import com.willfp.ecoenchants.config.RarityYml; import lombok.Getter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable;