From 229b6f91d035c0cce6c99f98e01d2a3a3a0c37c9 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 29 Dec 2020 23:24:16 +0000 Subject: [PATCH] Minor eco-util config refactor --- .../command/tabcompleters/TabCompleterEnchantinfo.java | 2 +- .../com/willfp/ecoenchants/config/EcoEnchantsConfigs.java | 2 +- .../com/willfp/ecoenchants/display/EnchantDisplay.java | 2 +- .../com/willfp/ecoenchants/display/EnchantmentCache.java | 2 +- .../com/willfp/ecoenchants/enchantments/EcoEnchants.java | 2 +- .../ecoenchants/enchantments/meta/EnchantmentRarity.java | 2 +- .../ecoenchants/enchantments/meta/EnchantmentTarget.java | 2 +- .../ecoenchants/enchantments/meta/EnchantmentType.java | 2 +- .../src/main/java/com/willfp/eco/util/config/Configs.java | 2 +- .../eco/util/config/{ => updating}/ConfigHandler.java | 8 ++++---- .../config/{ => updating}/annotations/ConfigUpdater.java | 2 +- .../exceptions}/InvalidUpdatableClassException.java | 5 +++-- .../exceptions}/InvalidUpdateMethodException.java | 2 +- .../com/willfp/eco/util/drops/internal/DropManager.java | 2 +- .../com/willfp/eco/util/plugin/AbstractEcoPlugin.java | 2 +- 15 files changed, 20 insertions(+), 19 deletions(-) rename eco-util/src/main/java/com/willfp/eco/util/config/{ => updating}/ConfigHandler.java (89%) rename eco-util/src/main/java/com/willfp/eco/util/config/{ => updating}/annotations/ConfigUpdater.java (82%) rename eco-util/src/main/java/com/willfp/eco/util/config/{annotations => updating/exceptions}/InvalidUpdatableClassException.java (72%) rename eco-util/src/main/java/com/willfp/eco/util/config/{annotations => updating/exceptions}/InvalidUpdateMethodException.java (88%) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java index 8401e075..b47c4a62 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java @@ -3,7 +3,7 @@ package com.willfp.ecoenchants.command.tabcompleters; import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.command.AbstractTabCompleter; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; 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 index 7a65c9a2..67496d77 100644 --- 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 @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.config; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.ecoenchants.config.configs.EnchantmentConfig; import com.willfp.ecoenchants.config.configs.Rarity; import com.willfp.ecoenchants.config.configs.Target; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index 7fe3b60b..5b27e997 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display; import com.google.common.collect.Lists; import com.willfp.eco.util.NumberUtils; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.ecoenchants.display.options.DisplayOptions; import com.willfp.ecoenchants.enchantments.EcoEnchant; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java index 39df1616..7733dbba 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display; import com.google.common.collect.ImmutableSet; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 590c1f7b..c4c5fd21 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -4,7 +4,7 @@ package com.willfp.ecoenchants.enchantments; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.AshArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CrimsonArtifact; 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 7fd93605..f035eaad 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 @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.meta; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.eco.util.integrations.placeholder.PlaceholderEntry; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.interfaces.Registerable; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java index 4f8ce350..b68ca7fc 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java @@ -1,7 +1,7 @@ package com.willfp.ecoenchants.enchantments.meta; import com.google.common.collect.ImmutableSet; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.eco.util.interfaces.Registerable; import com.willfp.ecoenchants.config.EcoEnchantsConfigs; import lombok.Getter; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java index 5f96d31b..6679f522 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java @@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.meta; import com.google.common.collect.ImmutableList; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java b/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java index eeb9ab57..e85ddc2a 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/Configs.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.config; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import com.willfp.eco.util.config.configs.Config; import com.willfp.eco.util.config.configs.Lang; import lombok.experimental.UtilityClass; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java b/eco-util/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java similarity index 89% rename from eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java rename to eco-util/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java index 184d34b6..469a64a4 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java @@ -1,8 +1,8 @@ -package com.willfp.eco.util.config; +package com.willfp.eco.util.config.updating; -import com.willfp.eco.util.config.annotations.ConfigUpdater; -import com.willfp.eco.util.config.annotations.InvalidUpdatableClassException; -import com.willfp.eco.util.config.annotations.InvalidUpdateMethodException; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.exceptions.InvalidUpdatableClassException; +import com.willfp.eco.util.config.updating.exceptions.InvalidUpdateMethodException; import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/ConfigUpdater.java b/eco-util/src/main/java/com/willfp/eco/util/config/updating/annotations/ConfigUpdater.java similarity index 82% rename from eco-util/src/main/java/com/willfp/eco/util/config/annotations/ConfigUpdater.java rename to eco-util/src/main/java/com/willfp/eco/util/config/updating/annotations/ConfigUpdater.java index 40d64862..9a308eee 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/ConfigUpdater.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/updating/annotations/ConfigUpdater.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.config.annotations; +package com.willfp.eco.util.config.updating.annotations; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdatableClassException.java b/eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdatableClassException.java similarity index 72% rename from eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdatableClassException.java rename to eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdatableClassException.java index e86ff815..f1f74c1a 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdatableClassException.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdatableClassException.java @@ -1,10 +1,11 @@ -package com.willfp.eco.util.config.annotations; +package com.willfp.eco.util.config.updating.exceptions; +import com.willfp.eco.util.config.updating.ConfigHandler; import org.jetbrains.annotations.NotNull; public class InvalidUpdatableClassException extends RuntimeException { /** - * Called when an updatable class is registered into an {@link com.willfp.eco.util.config.ConfigHandler}. + * Called when an updatable class is registered into an {@link ConfigHandler}. * * @param message The error message. */ diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdateMethodException.java b/eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdateMethodException.java similarity index 88% rename from eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdateMethodException.java rename to eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdateMethodException.java index 679f5642..4bdba968 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdateMethodException.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdateMethodException.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.config.annotations; +package com.willfp.eco.util.config.updating.exceptions; import org.jetbrains.annotations.NotNull; diff --git a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java index 89b539c6..f976d09a 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java +++ b/eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.drops.internal; import com.willfp.eco.util.config.Configs; -import com.willfp.eco.util.config.annotations.ConfigUpdater; +import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; import lombok.Getter; import lombok.experimental.UtilityClass; diff --git a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java index 98a55c7d..ac0b30fc 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java @@ -11,7 +11,7 @@ import com.willfp.eco.util.bukkit.scheduling.EcoScheduler; import com.willfp.eco.util.bukkit.scheduling.RunnableFactory; import com.willfp.eco.util.bukkit.scheduling.Scheduler; import com.willfp.eco.util.command.AbstractCommand; -import com.willfp.eco.util.config.ConfigHandler; +import com.willfp.eco.util.config.updating.ConfigHandler; import com.willfp.eco.util.config.Configs; import com.willfp.eco.util.drops.internal.DropManager; import com.willfp.eco.util.drops.internal.FastCollatedDropQueue;