From abd361f4b55780c3604fcc01e31bc8f54fa541b0 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Wed, 17 Feb 2021 13:30:06 +0000 Subject: [PATCH] Refactored config internals --- .../internal => internal/config}/AbstractConfig.java | 2 +- .../config}/AbstractUpdatableConfig.java | 2 +- .../eco/util/bukkit/scheduling/TimedRunnable.java | 11 +++++++++++ .../java/com/willfp/eco/util/config/BaseConfig.java | 2 +- .../com/willfp/eco/util/config/ExtendableConfig.java | 2 +- .../com/willfp/eco/util/config/StaticBaseConfig.java | 2 +- .../java/com/willfp/eco/util/config/ValueGetter.java | 5 ----- .../com/willfp/eco/util/interfaces/EcoRunnable.java | 11 ----------- 8 files changed, 16 insertions(+), 21 deletions(-) rename eco-util/src/main/java/com/willfp/eco/{util/config/internal => internal/config}/AbstractConfig.java (99%) rename eco-util/src/main/java/com/willfp/eco/{util/config/internal => internal/config}/AbstractUpdatableConfig.java (98%) create mode 100644 eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/TimedRunnable.java delete mode 100644 eco-util/src/main/java/com/willfp/eco/util/config/ValueGetter.java delete mode 100644 eco-util/src/main/java/com/willfp/eco/util/interfaces/EcoRunnable.java diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractConfig.java b/eco-util/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java similarity index 99% rename from eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractConfig.java rename to eco-util/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java index 7a65ea89..45749f79 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.config.internal; +package com.willfp.eco.internal.config; import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.internal.PluginDependent; diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractUpdatableConfig.java b/eco-util/src/main/java/com/willfp/eco/internal/config/AbstractUpdatableConfig.java similarity index 98% rename from eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractUpdatableConfig.java rename to eco-util/src/main/java/com/willfp/eco/internal/config/AbstractUpdatableConfig.java index a78a455d..4252fae0 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/internal/AbstractUpdatableConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/internal/config/AbstractUpdatableConfig.java @@ -1,4 +1,4 @@ -package com.willfp.eco.util.config.internal; +package com.willfp.eco.internal.config; import com.willfp.eco.util.plugin.AbstractEcoPlugin; import org.bukkit.configuration.InvalidConfigurationException; diff --git a/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/TimedRunnable.java b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/TimedRunnable.java new file mode 100644 index 00000000..14a754c0 --- /dev/null +++ b/eco-util/src/main/java/com/willfp/eco/util/bukkit/scheduling/TimedRunnable.java @@ -0,0 +1,11 @@ +package com.willfp.eco.util.bukkit.scheduling; + +public interface TimedRunnable extends Runnable { + /** + * The TimedRunnable interface is generally used for repeating tasks. + * This method is to retrieve the ticks between repetitions. + * + * @return The ticks between repetitions. + */ + long getTime(); +} diff --git a/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java b/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java index 4005f052..0916dc4a 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/BaseConfig.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.config; -import com.willfp.eco.util.config.internal.AbstractUpdatableConfig; +import com.willfp.eco.internal.config.AbstractUpdatableConfig; 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/ExtendableConfig.java b/eco-util/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java index 4ebc6ac7..775ee026 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.config; -import com.willfp.eco.util.config.internal.AbstractUpdatableConfig; +import com.willfp.eco.internal.config.AbstractUpdatableConfig; 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/StaticBaseConfig.java b/eco-util/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java index de0e8593..820306ec 100644 --- a/eco-util/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java +++ b/eco-util/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.config; -import com.willfp.eco.util.config.internal.AbstractConfig; +import com.willfp.eco.internal.config.AbstractConfig; 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/ValueGetter.java b/eco-util/src/main/java/com/willfp/eco/util/config/ValueGetter.java deleted file mode 100644 index 4b437e7b..00000000 --- a/eco-util/src/main/java/com/willfp/eco/util/config/ValueGetter.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.willfp.eco.util.config; - -@Deprecated -public interface ValueGetter { -} diff --git a/eco-util/src/main/java/com/willfp/eco/util/interfaces/EcoRunnable.java b/eco-util/src/main/java/com/willfp/eco/util/interfaces/EcoRunnable.java deleted file mode 100644 index 7a494763..00000000 --- a/eco-util/src/main/java/com/willfp/eco/util/interfaces/EcoRunnable.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.willfp.eco.util.interfaces; - -public interface EcoRunnable extends Runnable { - /** - * The EcoRunnable interface is generally used for repeating tasks. - * This method is to retrieve the ticks between repetitions. - * - * @return The ticks between repetitions. - */ - long getTime(); -}