Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-25 06:01:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor eco-util config refactor

Browse Source
This commit is contained in:
Auxilor 2020-12-29 23:24:16 +00:00
parent 93f9658852
commit 229b6f91d0
15 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/tabcompleters/TabCompleterEnchantinfo.java
View File

@ -3,7 +3,7 @@ package com.willfp.ecoenchants.command.tabcompleters;
import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.StringUtils;
import com.willfp.eco.util.command.AbstractCommand; import com.willfp.eco.util.command.AbstractCommand;
import com.willfp.eco.util.command.AbstractTabCompleter; 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.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.EcoEnchants;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/config/EcoEnchantsConfigs.java
View File

@ -1,6 +1,6 @@
package com.willfp.ecoenchants.config; 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.EnchantmentConfig;
import com.willfp.ecoenchants.config.configs.Rarity; import com.willfp.ecoenchants.config.configs.Rarity;
import com.willfp.ecoenchants.config.configs.Target; import com.willfp.ecoenchants.config.configs.Target;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.willfp.eco.util.NumberUtils; 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.eco.util.plugin.AbstractEcoPlugin;
import com.willfp.ecoenchants.display.options.DisplayOptions; import com.willfp.ecoenchants.display.options.DisplayOptions;
import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchant;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.display;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.willfp.eco.util.config.Configs; 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.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java
View File

@ -4,7 +4,7 @@ package com.willfp.ecoenchants.enchantments;
import com.google.common.collect.BiMap; import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap; import com.google.common.collect.HashBiMap;
import com.google.common.collect.ImmutableList; 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.AshArtifact;
import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CloudsArtifact;
import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CrimsonArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.CrimsonArtifact;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentRarity.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.meta;
import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.NumberUtils;
import com.willfp.eco.util.StringUtils; 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.PlaceholderEntry;
import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager;
import com.willfp.eco.util.interfaces.Registerable; import com.willfp.eco.util.interfaces.Registerable;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentTarget.java
View File

@ -1,7 +1,7 @@
package com.willfp.ecoenchants.enchantments.meta; package com.willfp.ecoenchants.enchantments.meta;
import com.google.common.collect.ImmutableSet; 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.eco.util.interfaces.Registerable;
import com.willfp.ecoenchants.config.EcoEnchantsConfigs; import com.willfp.ecoenchants.config.EcoEnchantsConfigs;
import lombok.Getter; import lombok.Getter;

2
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/meta/EnchantmentType.java
View File

@ -2,7 +2,7 @@ package com.willfp.ecoenchants.enchantments.meta;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.willfp.eco.util.config.Configs; 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.EcoEnchant;
import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact;
import com.willfp.ecoenchants.enchantments.itemtypes.Spell; import com.willfp.ecoenchants.enchantments.itemtypes.Spell;

2
eco-util/src/main/java/com/willfp/eco/util/config/Configs.java
View File

@ -1,6 +1,6 @@
package com.willfp.eco.util.config; 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.Config;
import com.willfp.eco.util.config.configs.Lang; import com.willfp.eco.util.config.configs.Lang;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

8
eco-util/src/main/java/com/willfp/eco/util/config/ConfigHandler.java → eco-util/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java
View File

@ -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.updating.annotations.ConfigUpdater;
import com.willfp.eco.util.config.annotations.InvalidUpdatableClassException; import com.willfp.eco.util.config.updating.exceptions.InvalidUpdatableClassException;
import com.willfp.eco.util.config.annotations.InvalidUpdateMethodException; import com.willfp.eco.util.config.updating.exceptions.InvalidUpdateMethodException;
import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.internal.PluginDependent;
import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.plugin.AbstractEcoPlugin;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
eco-util/src/main/java/com/willfp/eco/util/config/annotations/ConfigUpdater.java → eco-util/src/main/java/com/willfp/eco/util/config/updating/annotations/ConfigUpdater.java
View File

@ -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.ElementType;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;

5
eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdatableClassException.java → eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdatableClassException.java
View File

@ -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; import org.jetbrains.annotations.NotNull;
public class InvalidUpdatableClassException extends RuntimeException { 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. * @param message The error message.
*/ */

2
eco-util/src/main/java/com/willfp/eco/util/config/annotations/InvalidUpdateMethodException.java → eco-util/src/main/java/com/willfp/eco/util/config/updating/exceptions/InvalidUpdateMethodException.java
View File

@ -1,4 +1,4 @@
package com.willfp.eco.util.config.annotations; package com.willfp.eco.util.config.updating.exceptions;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;

2
eco-util/src/main/java/com/willfp/eco/util/drops/internal/DropManager.java
View File

@ -1,7 +1,7 @@
package com.willfp.eco.util.drops.internal; package com.willfp.eco.util.drops.internal;
import com.willfp.eco.util.config.Configs; 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.Getter;
import lombok.experimental.UtilityClass; import lombok.experimental.UtilityClass;

2
eco-util/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java
View File

@ -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.RunnableFactory;
import com.willfp.eco.util.bukkit.scheduling.Scheduler; import com.willfp.eco.util.bukkit.scheduling.Scheduler;
import com.willfp.eco.util.command.AbstractCommand; 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.config.Configs;
import com.willfp.eco.util.drops.internal.DropManager; import com.willfp.eco.util.drops.internal.DropManager;
import com.willfp.eco.util.drops.internal.FastCollatedDropQueue; import com.willfp.eco.util.drops.internal.FastCollatedDropQueue;