diff --git a/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java b/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java index 48200405..12ec78e5 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java @@ -1,7 +1,7 @@ package com.willfp.eco.internal.arrows; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Arrow; @@ -20,10 +20,10 @@ public class ArrowDataListener extends PluginDependent implements Listener { /** * Listener to add metadata to arrows about the enchantments on the bow that shot them. * - * @param plugin The {@link AbstractEcoPlugin} that registered the listener. + * @param plugin The {@link EcoPlugin} that registered the listener. */ @ApiStatus.Internal - public ArrowDataListener(@NotNull final AbstractEcoPlugin plugin) { + public ArrowDataListener(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/events/EcoEventManager.java b/eco-api/src/main/java/com/willfp/eco/internal/bukkit/events/EcoEventManager.java index 34c01cfb..3a396190 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/events/EcoEventManager.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/bukkit/events/EcoEventManager.java @@ -2,7 +2,7 @@ package com.willfp.eco.internal.bukkit.events; import com.willfp.eco.util.bukkit.events.EventManager; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; @@ -13,10 +13,10 @@ public class EcoEventManager extends PluginDependent implements EventManager { /** * Manager class for event management. * - * @param plugin The {@link AbstractEcoPlugin} that this manages the events of. + * @param plugin The {@link EcoPlugin} that this manages the events of. */ @ApiStatus.Internal - public EcoEventManager(@NotNull final AbstractEcoPlugin plugin) { + public EcoEventManager(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/logging/EcoLogger.java b/eco-api/src/main/java/com/willfp/eco/internal/bukkit/logging/EcoLogger.java deleted file mode 100644 index 245af835..00000000 --- a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/logging/EcoLogger.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.willfp.eco.internal.bukkit.logging; - -import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.bukkit.logging.Logger; -import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import org.jetbrains.annotations.NotNull; - -public class EcoLogger extends PluginDependent implements Logger { - /** - * Implementation of {@link Logger}. - * Manages logging for an {@link AbstractEcoPlugin}. - * - * @param plugin The {@link AbstractEcoPlugin} for the logger to manage. - */ - public EcoLogger(@NotNull final AbstractEcoPlugin plugin) { - super(plugin); - } - - /** - * Log an informative/neutral message to console. - * - * @param message The message to log. - */ - @Override - public void info(@NotNull final String message) { - this.getPlugin().getLogger().info(StringUtils.translate(message)); - } - - /** - * Log a warning to console. - * - * @param message The message to log. - */ - @Override - public void warn(@NotNull final String message) { - this.getPlugin().getLogger().warning(StringUtils.translate(message)); - } - - /** - * Log an error to console. - * - * @param message The message to log. - */ - @Override - public void error(@NotNull final String message) { - this.getPlugin().getLogger().severe(StringUtils.translate(message)); - } -} diff --git a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/scheduling/EcoScheduler.java b/eco-api/src/main/java/com/willfp/eco/internal/bukkit/scheduling/EcoScheduler.java index 2e3e40ed..306015ee 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/bukkit/scheduling/EcoScheduler.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/bukkit/scheduling/EcoScheduler.java @@ -2,7 +2,7 @@ package com.willfp.eco.internal.bukkit.scheduling; import com.willfp.eco.util.bukkit.scheduling.Scheduler; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.ApiStatus; @@ -10,12 +10,12 @@ import org.jetbrains.annotations.NotNull; public class EcoScheduler extends PluginDependent implements Scheduler { /** - * Create a scheduler to manage the tasks of an {@link AbstractEcoPlugin}. + * Create a scheduler to manage the tasks of an {@link EcoPlugin}. * * @param plugin The plugin to manage. */ @ApiStatus.Internal - public EcoScheduler(@NotNull final AbstractEcoPlugin plugin) { + public EcoScheduler(@NotNull final EcoPlugin plugin) { super(plugin); } @@ -100,7 +100,7 @@ public class EcoScheduler extends PluginDependent implements Scheduler { } /** - * Cancel all running tasks from the linked {@link AbstractEcoPlugin}. + * Cancel all running tasks from the linked {@link EcoPlugin}. */ @Override public void cancelAll() { diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java index 782dae04..57f81e63 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigSection.java @@ -3,14 +3,13 @@ package com.willfp.eco.internal.config; import org.bukkit.configuration.ConfigurationSection; import org.jetbrains.annotations.NotNull; -public class ConfigSection extends AbstractUndefinedConfig { +public class ConfigSection extends ConfigWrapper { /** * Config section. * * @param section The section. */ protected ConfigSection(@NotNull final ConfigurationSection section) { - super("subsection"); this.init(section); } } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java index 924de495..a01919f5 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java @@ -4,6 +4,8 @@ import com.willfp.eco.util.SerializationUtils; import com.willfp.eco.util.StringUtils; import com.willfp.eco.util.config.Config; import com.willfp.eco.util.serialization.EcoSerializable; +import lombok.AccessLevel; +import lombok.Getter; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.MemorySection; import org.jetbrains.annotations.NotNull; @@ -16,11 +18,12 @@ import java.util.Map; import java.util.Objects; @SuppressWarnings({"unchecked", "unused", "DeprecatedIsStillUsed"}) -public abstract class AbstractUndefinedConfig implements Config { +public abstract class ConfigWrapper implements Config { /** * The linked {@link MemorySection} where values are physically stored. */ - protected T config = null; + @Getter(AccessLevel.PROTECTED) + private T config = null; /** * Cached values for faster reading. @@ -29,10 +32,8 @@ public abstract class AbstractUndefinedConfig im /** * Abstract config. - * - * @param configName The name of the config */ - protected AbstractUndefinedConfig(@NotNull final String configName) { + protected ConfigWrapper() { } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java b/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableYamlConfig.java similarity index 87% rename from eco-api/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java rename to eco-api/src/main/java/com/willfp/eco/internal/config/LoadableYamlConfig.java index 37736304..5b5d3895 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/config/AbstractConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/config/LoadableYamlConfig.java @@ -1,10 +1,11 @@ package com.willfp.eco.internal.config; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.AccessLevel; import lombok.Getter; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; +import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; import java.io.BufferedReader; @@ -16,7 +17,7 @@ import java.io.InputStreamReader; import java.io.OutputStream; import java.nio.charset.StandardCharsets; -public abstract class AbstractConfig extends AbstractUndefinedConfig { +public abstract class LoadableYamlConfig extends ConfigWrapper { /** * The physical config file, as stored on disk. */ @@ -27,7 +28,7 @@ public abstract class AbstractConfig extends AbstractUndefinedConfig source) { - super(configName); + protected LoadableYamlConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin, + @NotNull final String subDirectoryPath, + @NotNull final Class source) { this.plugin = plugin; this.name = configName + ".yml"; this.source = source; @@ -151,8 +151,8 @@ public abstract class AbstractConfig extends AbstractUndefinedConfig source, - final boolean removeUnused, - @NotNull final String... updateBlacklist) { + protected UpdatableYamlConfig(@NotNull final String configName, + @NotNull final EcoPlugin plugin, + @NotNull final String subDirectoryPath, + @NotNull final Class source, + final boolean removeUnused, + @NotNull final String... updateBlacklist) { super(configName, plugin, subDirectoryPath, source); this.removeUnused = removeUnused; this.updateBlacklist = new ArrayList<>(Arrays.asList(updateBlacklist)); @@ -53,33 +53,33 @@ public abstract class AbstractUpdatableConfig extends AbstractConfig { public void update() { super.clearCache(); try { - config.load(this.getConfigFile()); + this.getConfig().load(this.getConfigFile()); YamlConfiguration newConfig = this.getConfigInJar(); - if (newConfig.getKeys(true).equals(config.getKeys(true))) { + if (newConfig.getKeys(true).equals(this.getConfig().getKeys(true))) { return; } newConfig.getKeys(true).forEach((s -> { - if (!config.getKeys(true).contains(s)) { + if (!this.getConfig().getKeys(true).contains(s)) { if (updateBlacklist.stream().noneMatch(s::contains)) { - config.set(s, newConfig.get(s)); + this.getConfig().set(s, newConfig.get(s)); } } })); if (this.removeUnused) { - config.getKeys(true).forEach((s -> { + this.getConfig().getKeys(true).forEach((s -> { if (!newConfig.getKeys(true).contains(s)) { if (updateBlacklist.stream().noneMatch(s::contains)) { - config.set(s, null); + this.getConfig().set(s, null); } } })); } - config.save(this.getConfigFile()); + this.getConfig().save(this.getConfigFile()); } catch (IOException | InvalidConfigurationException e) { e.printStackTrace(); } diff --git a/eco-api/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java b/eco-api/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java index c2ba31f7..32fda149 100644 --- a/eco-api/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java +++ b/eco-api/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java @@ -5,7 +5,7 @@ import com.willfp.eco.util.extensions.Extension; import com.willfp.eco.util.extensions.MalformedExtensionException; import com.willfp.eco.util.extensions.ExtensionLoader; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.apache.commons.lang.Validate; import org.bukkit.configuration.file.YamlConfiguration; import org.jetbrains.annotations.NotNull; @@ -31,11 +31,11 @@ public class EcoExtensionLoader extends PluginDependent implements ExtensionLoad private final Set extensions = new HashSet<>(); /** - * Create a new extension loader and link it to a specific {@link AbstractEcoPlugin}. + * Create a new extension loader and link it to a specific {@link EcoPlugin}. * * @param plugin The plugin to manage */ - public EcoExtensionLoader(@NotNull final AbstractEcoPlugin plugin) { + public EcoExtensionLoader(@NotNull final EcoPlugin plugin) { super(plugin); } @@ -63,7 +63,7 @@ public class EcoExtensionLoader extends PluginDependent implements ExtensionLoad try { loadExtension(extensionJar); } catch (MalformedExtensionException e) { - this.getPlugin().getLog().error(extensionJar.getName() + " caused MalformedExtensionException: " + e.getMessage()); + this.getPlugin().getLogger().severe(extensionJar.getName() + " caused MalformedExtensionException: " + e.getMessage()); } } } @@ -105,7 +105,7 @@ public class EcoExtensionLoader extends PluginDependent implements ExtensionLoad Object object = null; try { cls = cl.loadClass(mainClass); - object = cls.getConstructor(AbstractEcoPlugin.class).newInstance(this.getPlugin()); + object = cls.getConstructor(EcoPlugin.class).newInstance(this.getPlugin()); } catch (ReflectiveOperationException e) { e.printStackTrace(); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java index dc95f45a..464fdb63 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java +++ b/eco-api/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java @@ -1,22 +1,22 @@ package com.willfp.eco.util.bukkit.keys; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.NamespacedKey; import org.jetbrains.annotations.NotNull; public class NamespacedKeyFactory extends PluginDependent { /** - * Factory class to produce {@link NamespacedKey}s associated with an {@link AbstractEcoPlugin}. + * Factory class to produce {@link NamespacedKey}s associated with an {@link EcoPlugin}. * * @param plugin The plugin that this factory creates keys for. */ - public NamespacedKeyFactory(@NotNull final AbstractEcoPlugin plugin) { + public NamespacedKeyFactory(@NotNull final EcoPlugin plugin) { super(plugin); } /** - * Create an {@link NamespacedKey} associated with an {@link AbstractEcoPlugin}. + * Create an {@link NamespacedKey} associated with an {@link EcoPlugin}. * * @param key The key in the {@link NamespacedKey}. * @return The created {@link NamespacedKey}. diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/logging/Logger.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/logging/Logger.java deleted file mode 100644 index ed2e9720..00000000 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/logging/Logger.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.willfp.eco.util.bukkit.logging; - -public interface Logger { - /** - * Log an informative/neutral message to console. - * - * @param message The message to log. - */ - void info(String message); - - /** - * Log a warning to console. - * - * @param message The message to log. - */ - void warn(String message); - - /** - * Log an error to console. - * - * @param message The message to log. - */ - void error(String message); -} diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java index c1592634..13107f56 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java +++ b/eco-api/src/main/java/com/willfp/eco/util/bukkit/meta/MetadataValueFactory.java @@ -1,22 +1,22 @@ package com.willfp.eco.util.bukkit.meta; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.metadata.FixedMetadataValue; import org.jetbrains.annotations.NotNull; public class MetadataValueFactory extends PluginDependent { /** - * Factory class to produce {@link FixedMetadataValue}s associated with an {@link AbstractEcoPlugin}. + * Factory class to produce {@link FixedMetadataValue}s associated with an {@link EcoPlugin}. * * @param plugin The plugin that this factory creates values for. */ - public MetadataValueFactory(@NotNull final AbstractEcoPlugin plugin) { + public MetadataValueFactory(@NotNull final EcoPlugin plugin) { super(plugin); } /** - * Create an {@link FixedMetadataValue} associated with an {@link AbstractEcoPlugin} with a specified value. + * Create an {@link FixedMetadataValue} associated with an {@link EcoPlugin} with a specified value. * * @param value The value of meta key. * @return The created {@link FixedMetadataValue}. diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoBukkitRunnable.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoBukkitRunnable.java index 53cbd4cd..dccfb2ac 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoBukkitRunnable.java +++ b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/EcoBukkitRunnable.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.scheduling; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.ApiStatus; @@ -8,28 +8,28 @@ import org.jetbrains.annotations.NotNull; public abstract class EcoBukkitRunnable extends BukkitRunnable { /** - * The linked {@link AbstractEcoPlugin} to associate runnables with. + * The linked {@link EcoPlugin} to associate runnables with. */ - private final AbstractEcoPlugin plugin; + private final EcoPlugin plugin; /** * Creates a new {@link EcoBukkitRunnable}. *

* Cannot be instantiated normally, use {@link RunnableFactory}. * - * @param plugin The {@link AbstractEcoPlugin} to associate runnables with. + * @param plugin The {@link EcoPlugin} to associate runnables with. */ @ApiStatus.Internal - EcoBukkitRunnable(@NotNull final AbstractEcoPlugin plugin) { + EcoBukkitRunnable(@NotNull final EcoPlugin plugin) { this.plugin = plugin; } /** - * Get the {@link AbstractEcoPlugin} that created this runnable. + * Get the {@link EcoPlugin} that created this runnable. * * @return The linked plugin. */ - protected final AbstractEcoPlugin getPlugin() { + protected final EcoPlugin getPlugin() { return this.plugin; } diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java index 25017222..12d2381c 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java +++ b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/RunnableFactory.java @@ -1,18 +1,18 @@ package com.willfp.eco.util.bukkit.scheduling; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; public class RunnableFactory extends PluginDependent { /** - * Factory class to produce {@link EcoBukkitRunnable}s associated with an {@link AbstractEcoPlugin}. + * Factory class to produce {@link EcoBukkitRunnable}s associated with an {@link EcoPlugin}. * * @param plugin The plugin that this factory creates runnables for. */ - public RunnableFactory(@NotNull final AbstractEcoPlugin plugin) { + public RunnableFactory(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/Scheduler.java b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/Scheduler.java index 015981e0..06d0a7a8 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/Scheduler.java +++ b/eco-api/src/main/java/com/willfp/eco/util/bukkit/scheduling/Scheduler.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.bukkit.scheduling; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.scheduler.BukkitTask; import org.jetbrains.annotations.NotNull; @@ -68,7 +68,7 @@ public interface Scheduler { long repeat); /** - * Cancel all running tasks from the linked {@link AbstractEcoPlugin}. + * Cancel all running tasks from the linked {@link EcoPlugin}. */ void cancelAll(); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/command/AbstractCommand.java b/eco-api/src/main/java/com/willfp/eco/util/command/AbstractCommand.java index 5da686a6..775233a6 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/command/AbstractCommand.java +++ b/eco-api/src/main/java/com/willfp/eco/util/command/AbstractCommand.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.command; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; @@ -43,12 +43,12 @@ public abstract class AbstractCommand extends PluginDependent implements Command *

* The name cannot be the same as an existing command as this will conflict. * - * @param plugin The owning {@link AbstractEcoPlugin}. + * @param plugin The owning {@link EcoPlugin}. * @param name The name used in execution. * @param permission The permission required to execute the command. * @param playersOnly If only players should be able to execute this command. */ - protected AbstractCommand(@NotNull final AbstractEcoPlugin plugin, + protected AbstractCommand(@NotNull final EcoPlugin plugin, @NotNull final String name, @NotNull final String permission, final boolean playersOnly) { @@ -98,7 +98,7 @@ public abstract class AbstractCommand extends PluginDependent implements Command * @param command The bukkit command. * @param label The name of the executed command. * @param args The arguments of the command (anything after the physical command name) - * @return If the command was processed by the linked {@link AbstractEcoPlugin} + * @return If the command was processed by the linked {@link EcoPlugin} */ @Override public final boolean onCommand(@NotNull final CommandSender sender, diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/BaseConfig.java b/eco-api/src/main/java/com/willfp/eco/util/config/BaseConfig.java index 0916dc4a..c0b8b15e 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/BaseConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/BaseConfig.java @@ -1,10 +1,10 @@ package com.willfp.eco.util.config; -import com.willfp.eco.internal.config.AbstractUpdatableConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.internal.config.UpdatableYamlConfig; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; -public abstract class BaseConfig extends AbstractUpdatableConfig { +public abstract class BaseConfig extends UpdatableYamlConfig { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). @@ -18,7 +18,7 @@ public abstract class BaseConfig extends AbstractUpdatableConfig { */ protected BaseConfig(@NotNull final String configName, final boolean removeUnused, - @NotNull final AbstractEcoPlugin plugin, + @NotNull final EcoPlugin plugin, @NotNull final String... updateBlacklist) { super(configName, plugin, "", plugin.getClass(), removeUnused, updateBlacklist); } @@ -34,7 +34,7 @@ public abstract class BaseConfig extends AbstractUpdatableConfig { */ protected BaseConfig(@NotNull final String configName, final boolean removeUnused, - @NotNull final AbstractEcoPlugin plugin) { + @NotNull final EcoPlugin plugin) { super(configName, plugin, "", plugin.getClass(), removeUnused, ""); } } diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java b/eco-api/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java index 775ee026..7e0316b4 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/ExtendableConfig.java @@ -1,10 +1,10 @@ package com.willfp.eco.util.config; -import com.willfp.eco.internal.config.AbstractUpdatableConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.internal.config.UpdatableYamlConfig; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; -public abstract class ExtendableConfig extends AbstractUpdatableConfig { +public abstract class ExtendableConfig extends UpdatableYamlConfig { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *

@@ -19,7 +19,7 @@ public abstract class ExtendableConfig extends AbstractUpdatableConfig { */ protected ExtendableConfig(@NotNull final String configName, final boolean removeUnused, - @NotNull final AbstractEcoPlugin plugin, + @NotNull final EcoPlugin plugin, @NotNull final Class source, @NotNull final String subDirectoryPath, @NotNull final String... updateBlacklist) { diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java b/eco-api/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java index 820306ec..a9de6ff5 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/StaticBaseConfig.java @@ -1,10 +1,10 @@ package com.willfp.eco.util.config; -import com.willfp.eco.internal.config.AbstractConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.internal.config.LoadableYamlConfig; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; -public abstract class StaticBaseConfig extends AbstractConfig { +public abstract class StaticBaseConfig extends LoadableYamlConfig { /** * Config implementation for configs present in the plugin's base directory (eg config.yml, lang.yml). *

@@ -14,7 +14,7 @@ public abstract class StaticBaseConfig extends AbstractConfig { * @param plugin The plugin. */ protected StaticBaseConfig(@NotNull final String configName, - @NotNull final AbstractEcoPlugin plugin) { + @NotNull final EcoPlugin plugin) { super(configName, plugin, "", plugin.getClass()); } } diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/StaticOptionalConfig.java b/eco-api/src/main/java/com/willfp/eco/util/config/StaticOptionalConfig.java deleted file mode 100644 index 4df45f4f..00000000 --- a/eco-api/src/main/java/com/willfp/eco/util/config/StaticOptionalConfig.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.willfp.eco.util.config; - -import com.willfp.eco.internal.config.AbstractUndefinedConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import org.bukkit.configuration.file.YamlConfiguration; -import org.jetbrains.annotations.NotNull; - -public abstract class StaticOptionalConfig extends AbstractUndefinedConfig { - /** - * Config implementation for passing YamlConfigurations. - *

- * Does not automatically update. - * - * @param configName The name of the config - * @param plugin The plugin. - * @param config The YamlConfiguration handle. - * @deprecated Plugin not required. - */ - @Deprecated - public StaticOptionalConfig(@NotNull final String configName, - @NotNull final AbstractEcoPlugin plugin, - @NotNull final YamlConfiguration config) { - this(configName, config); - } - - /** - * Config implementation for passing YamlConfigurations. - *

- * Does not automatically update. - * - * @param configName The name of the config - * @param config The YamlConfiguration handle. - */ - public StaticOptionalConfig(@NotNull final String configName, - @NotNull final YamlConfiguration config) { - super(configName); - - init(config); - } -} diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/YamlConfig.java b/eco-api/src/main/java/com/willfp/eco/util/config/YamlConfig.java new file mode 100644 index 00000000..8ce77177 --- /dev/null +++ b/eco-api/src/main/java/com/willfp/eco/util/config/YamlConfig.java @@ -0,0 +1,18 @@ +package com.willfp.eco.util.config; + +import com.willfp.eco.internal.config.ConfigWrapper; +import org.bukkit.configuration.file.YamlConfiguration; +import org.jetbrains.annotations.NotNull; + +public abstract class YamlConfig extends ConfigWrapper { + /** + * Config implementation for passing YamlConfigurations. + *

+ * Does not automatically update. + * + * @param config The YamlConfiguration handle. + */ + public YamlConfig(@NotNull final YamlConfiguration config) { + init(config); + } +} diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/configs/Config.java b/eco-api/src/main/java/com/willfp/eco/util/config/configs/Config.java index f2a295c3..9d93ba67 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/configs/Config.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/configs/Config.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.config.configs; import com.willfp.eco.util.config.BaseConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; @@ -11,7 +11,7 @@ public class Config extends BaseConfig { * * @param plugin The plugin. */ - public Config(@NotNull final AbstractEcoPlugin plugin) { + public Config(@NotNull final EcoPlugin plugin) { super("config", true, plugin); } } diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/configs/Lang.java b/eco-api/src/main/java/com/willfp/eco/util/config/configs/Lang.java index 9b83f287..c1d8cc9b 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/configs/Lang.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/configs/Lang.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.config.configs; import com.willfp.eco.util.config.BaseConfig; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; public class Lang extends BaseConfig { @@ -10,7 +10,7 @@ public class Lang extends BaseConfig { * * @param plugin The plugin. */ - public Lang(@NotNull final AbstractEcoPlugin plugin) { + public Lang(@NotNull final EcoPlugin plugin) { super("lang", false, plugin); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java b/eco-api/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java index 469a64a4..ab6e70aa 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java +++ b/eco-api/src/main/java/com/willfp/eco/util/config/updating/ConfigHandler.java @@ -4,7 +4,7 @@ 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 com.willfp.eco.util.plugin.EcoPlugin; import org.jetbrains.annotations.NotNull; import java.lang.reflect.InvocationTargetException; @@ -21,11 +21,11 @@ public class ConfigHandler extends PluginDependent { private final Set> updatableClasses = new HashSet<>(); /** - * Creates a new config handler and links it to an {@link AbstractEcoPlugin}. + * Creates a new config handler and links it to an {@link EcoPlugin}. * * @param plugin The plugin to manage. */ - public ConfigHandler(@NotNull final AbstractEcoPlugin plugin) { + public ConfigHandler(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-api/src/main/java/com/willfp/eco/util/display/DisplayModule.java b/eco-api/src/main/java/com/willfp/eco/util/display/DisplayModule.java index da2bce28..ad4eefa3 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/display/DisplayModule.java +++ b/eco-api/src/main/java/com/willfp/eco/util/display/DisplayModule.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.display; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.Getter; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; @@ -19,7 +19,7 @@ public abstract class DisplayModule extends PluginDependent { * @param plugin The plugin that the display is for. * @param priority The priority of the module. */ - protected DisplayModule(@NotNull final AbstractEcoPlugin plugin, + protected DisplayModule(@NotNull final EcoPlugin plugin, @NotNull final DisplayPriority priority) { super(plugin); this.priority = priority; diff --git a/eco-api/src/main/java/com/willfp/eco/util/extensions/Extension.java b/eco-api/src/main/java/com/willfp/eco/util/extensions/Extension.java index ce55e4aa..1b57545c 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/extensions/Extension.java +++ b/eco-api/src/main/java/com/willfp/eco/util/extensions/Extension.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.extensions; import com.willfp.eco.internal.extensions.ExtensionMetadata; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.AccessLevel; import lombok.Getter; import org.apache.commons.lang.Validate; @@ -9,17 +9,17 @@ import org.jetbrains.annotations.NotNull; public abstract class Extension { /** - * The {@link AbstractEcoPlugin} that this extension is for. + * The {@link EcoPlugin} that this extension is for. */ @Getter(AccessLevel.PROTECTED) - private final AbstractEcoPlugin plugin; + private final EcoPlugin plugin; /** * Create a new extension for a plugin. * * @param plugin The plugin. */ - protected Extension(@NotNull final AbstractEcoPlugin plugin) { + protected Extension(@NotNull final EcoPlugin plugin) { this.plugin = plugin; } diff --git a/eco-api/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatManager.java b/eco-api/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatManager.java index 3273ea43..fe08ac5f 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatManager.java +++ b/eco-api/src/main/java/com/willfp/eco/util/integrations/anticheat/AnticheatManager.java @@ -1,6 +1,6 @@ package com.willfp.eco.util.integrations.anticheat; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.experimental.UtilityClass; import org.bukkit.entity.Player; import org.bukkit.event.Listener; @@ -22,7 +22,7 @@ public class AnticheatManager { * @param plugin The plugin. * @param anticheat The anticheat to register. */ - public void register(@NotNull final AbstractEcoPlugin plugin, + public void register(@NotNull final EcoPlugin plugin, @NotNull final AnticheatWrapper anticheat) { if (anticheat instanceof Listener) { plugin.getEventManager().registerListener((Listener) anticheat); diff --git a/eco-api/src/main/java/com/willfp/eco/util/integrations/placeholder/plugins/PlaceholderIntegrationPAPI.java b/eco-api/src/main/java/com/willfp/eco/util/integrations/placeholder/plugins/PlaceholderIntegrationPAPI.java index 5bfda293..c031e89d 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/integrations/placeholder/plugins/PlaceholderIntegrationPAPI.java +++ b/eco-api/src/main/java/com/willfp/eco/util/integrations/placeholder/plugins/PlaceholderIntegrationPAPI.java @@ -2,7 +2,7 @@ package com.willfp.eco.util.integrations.placeholder.plugins; import com.willfp.eco.util.integrations.placeholder.PlaceholderIntegration; import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.expansion.PlaceholderExpansion; import org.bukkit.entity.Player; @@ -13,14 +13,14 @@ public class PlaceholderIntegrationPAPI extends PlaceholderExpansion implements /** * The linked plugin. */ - private final AbstractEcoPlugin plugin; + private final EcoPlugin plugin; /** * Create a new PlaceholderAPI integration. * * @param plugin The plugin to manage placeholders for. */ - public PlaceholderIntegrationPAPI(@NotNull final AbstractEcoPlugin plugin) { + public PlaceholderIntegrationPAPI(@NotNull final EcoPlugin plugin) { this.plugin = plugin; } diff --git a/eco-api/src/main/java/com/willfp/eco/util/internal/PluginDependent.java b/eco-api/src/main/java/com/willfp/eco/util/internal/PluginDependent.java index b17bdab3..37d752ea 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/internal/PluginDependent.java +++ b/eco-api/src/main/java/com/willfp/eco/util/internal/PluginDependent.java @@ -1,23 +1,23 @@ package com.willfp.eco.util.internal; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.AccessLevel; import lombok.Getter; import org.jetbrains.annotations.NotNull; public abstract class PluginDependent { /** - * The {@link AbstractEcoPlugin} that is stored. + * The {@link EcoPlugin} that is stored. */ @Getter(AccessLevel.PROTECTED) - private final AbstractEcoPlugin plugin; + private final EcoPlugin plugin; /** - * Pass an {@link AbstractEcoPlugin} in order to interface with it. + * Pass an {@link EcoPlugin} in order to interface with it. * * @param plugin The plugin to manage. */ - protected PluginDependent(@NotNull final AbstractEcoPlugin plugin) { + protected PluginDependent(@NotNull final EcoPlugin plugin) { this.plugin = plugin; } } diff --git a/eco-api/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java b/eco-api/src/main/java/com/willfp/eco/util/plugin/EcoPlugin.java similarity index 85% rename from eco-api/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java rename to eco-api/src/main/java/com/willfp/eco/util/plugin/EcoPlugin.java index 84e9d5e8..af40d539 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/plugin/AbstractEcoPlugin.java +++ b/eco-api/src/main/java/com/willfp/eco/util/plugin/EcoPlugin.java @@ -2,12 +2,10 @@ package com.willfp.eco.util.plugin; import com.willfp.eco.internal.arrows.ArrowDataListener; import com.willfp.eco.internal.bukkit.events.EcoEventManager; -import com.willfp.eco.internal.bukkit.logging.EcoLogger; import com.willfp.eco.internal.bukkit.scheduling.EcoScheduler; import com.willfp.eco.internal.extensions.EcoExtensionLoader; import com.willfp.eco.util.bukkit.events.EventManager; import com.willfp.eco.util.bukkit.keys.NamespacedKeyFactory; -import com.willfp.eco.util.bukkit.logging.Logger; import com.willfp.eco.util.bukkit.meta.MetadataValueFactory; import com.willfp.eco.util.bukkit.scheduling.RunnableFactory; import com.willfp.eco.util.bukkit.scheduling.Scheduler; @@ -41,7 +39,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -public abstract class AbstractEcoPlugin extends JavaPlugin { +public abstract class EcoPlugin extends JavaPlugin { /** * Loaded eco plugins. */ @@ -93,12 +91,6 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { */ private final List> updatableClasses = new ArrayList<>(); - /** - * The internal plugin logger. - */ - @Getter - private final Logger log; - /** * The internal plugin scheduler. */ @@ -176,18 +168,17 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { * @param proxyPackage The package where proxy implementations are stored. * @param color The color of the plugin (used in messages, such as &a, &b) */ - protected AbstractEcoPlugin(@NotNull final String pluginName, - final int resourceId, - final int bStatsId, - @NotNull final String proxyPackage, - @NotNull final String color) { + protected EcoPlugin(@NotNull final String pluginName, + final int resourceId, + final int bStatsId, + @NotNull final String proxyPackage, + @NotNull final String color) { this.pluginName = pluginName; this.resourceId = resourceId; this.bStatsId = bStatsId; this.proxyPackage = proxyPackage; this.color = color; - this.log = new EcoLogger(this); this.scheduler = new EcoScheduler(this); this.eventManager = new EcoEventManager(this); this.namespacedKeyFactory = new NamespacedKeyFactory(this); @@ -209,8 +200,8 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { public final void onEnable() { super.onLoad(); - this.getLog().info(""); - this.getLog().info("Loading " + this.color + this.pluginName); + this.getLogger().info(""); + this.getLogger().info("Loading " + this.color + this.pluginName); this.getEventManager().registerListener(new ArrowDataListener(this)); @@ -220,9 +211,9 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { if (!(currentVersion.compareTo(mostRecentVersion) > 0 || currentVersion.equals(mostRecentVersion))) { this.outdated = true; this.getScheduler().runTimer(() -> { - this.getLog().info("&c " + this.pluginName + " is out of date! (Version " + this.getDescription().getVersion() + ")"); - this.getLog().info("&cThe newest version is &f" + version); - this.getLog().info("&cDownload the new version!"); + this.getLogger().info("&c " + this.pluginName + " is out of date! (Version " + this.getDescription().getVersion() + ")"); + this.getLogger().info("&cThe newest version is &f" + version); + this.getLogger().info("&cDownload the new version!"); }, 0, 864000); } }); @@ -243,7 +234,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { } })); - this.getLog().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations())); + this.getLogger().info("Loaded integrations: " + String.join(", ", this.getLoadedIntegrations())); Prerequisite.update(); @@ -265,7 +256,7 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { this.enable(); - this.getLog().info(""); + this.getLogger().info(""); } /** @@ -308,23 +299,23 @@ public abstract class AbstractEcoPlugin extends JavaPlugin { }); if (!Prerequisite.HAS_PAPER.isMet()) { - this.getLog().error(""); - this.getLog().error("----------------------------"); - this.getLog().error(""); - this.getLog().error("You don't seem to be running paper!"); - this.getLog().error("Paper is strongly recommended for all servers,"); - this.getLog().error("and some things may not function properly without it"); - this.getLog().error("Download Paper from &fhttps://papermc.io"); - this.getLog().error(""); - this.getLog().error("----------------------------"); - this.getLog().error(""); + this.getLogger().severe(""); + this.getLogger().severe("----------------------------"); + this.getLogger().severe(""); + this.getLogger().severe("You don't seem to be running paper!"); + this.getLogger().severe("Paper is strongly recommended for all servers,"); + this.getLogger().severe("and some things may not function properly without it"); + this.getLogger().severe("Download Paper from &fhttps://papermc.io"); + this.getLogger().severe(""); + this.getLogger().severe("----------------------------"); + this.getLogger().severe(""); } this.postLoad(); this.reload(); - this.getLog().info("Loaded " + this.color + this.pluginName); + this.getLogger().info("Loaded " + this.color + this.pluginName); } /** diff --git a/eco-api/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java b/eco-api/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java index fa9f0f04..1b0ea937 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java +++ b/eco-api/src/main/java/com/willfp/eco/util/protocollib/AbstractPacketAdapter.java @@ -6,7 +6,7 @@ import com.comphenix.protocol.events.ListenerPriority; import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.Getter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -35,7 +35,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter { * @param priority The priority at which the adapter should be ran on packet send/receive. * @param postLoad If the packet adapter should be registered after the server has loaded. */ - protected AbstractPacketAdapter(@NotNull final AbstractEcoPlugin plugin, + protected AbstractPacketAdapter(@NotNull final EcoPlugin plugin, @NotNull final PacketType type, @NotNull final ListenerPriority priority, final boolean postLoad) { @@ -51,7 +51,7 @@ public abstract class AbstractPacketAdapter extends PacketAdapter { * @param type The {@link PacketType} to listen for. * @param postLoad If the packet adapter should be registered after the server has loaded. */ - protected AbstractPacketAdapter(@NotNull final AbstractEcoPlugin plugin, + protected AbstractPacketAdapter(@NotNull final EcoPlugin plugin, @NotNull final PacketType type, final boolean postLoad) { this(plugin, type, ListenerPriority.NORMAL, postLoad); diff --git a/eco-api/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java b/eco-api/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java index 189d5f02..94048362 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java +++ b/eco-api/src/main/java/com/willfp/eco/util/recipe/recipes/EcoShapedRecipe.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.recipe.recipes; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.recipe.Recipes; import com.willfp.eco.util.recipe.parts.EmptyRecipePart; import com.willfp.eco.util.recipe.parts.RecipePart; @@ -38,7 +38,7 @@ public final class EcoShapedRecipe extends PluginDependent { @Getter private final ItemStack output; - private EcoShapedRecipe(@NotNull final AbstractEcoPlugin plugin, + private EcoShapedRecipe(@NotNull final EcoPlugin plugin, @NotNull final String key, @NotNull final RecipePart[] parts, @NotNull final ItemStack output) { @@ -110,7 +110,7 @@ public final class EcoShapedRecipe extends PluginDependent { * @param key The recipe key. * @return A new builder. */ - public static Builder builder(@NotNull final AbstractEcoPlugin plugin, + public static Builder builder(@NotNull final EcoPlugin plugin, @NotNull final String key) { return new Builder(plugin, key); } @@ -134,7 +134,7 @@ public final class EcoShapedRecipe extends PluginDependent { /** * The plugin that created the recipe. */ - private final AbstractEcoPlugin plugin; + private final EcoPlugin plugin; /** * Create a new recipe builder. @@ -142,7 +142,7 @@ public final class EcoShapedRecipe extends PluginDependent { * @param plugin The plugin that owns the recipe. * @param key The recipe key. */ - private Builder(@NotNull final AbstractEcoPlugin plugin, + private Builder(@NotNull final EcoPlugin plugin, @NotNull final String key) { this.key = key; this.plugin = plugin; diff --git a/eco-api/src/main/java/com/willfp/eco/util/updater/UpdateChecker.java b/eco-api/src/main/java/com/willfp/eco/util/updater/UpdateChecker.java index 2353948c..d4920889 100644 --- a/eco-api/src/main/java/com/willfp/eco/util/updater/UpdateChecker.java +++ b/eco-api/src/main/java/com/willfp/eco/util/updater/UpdateChecker.java @@ -1,7 +1,7 @@ package com.willfp.eco.util.updater; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.util.Consumer; import org.jetbrains.annotations.NotNull; @@ -16,7 +16,7 @@ public class UpdateChecker extends PluginDependent { * * @param plugin The plugin to check. */ - public UpdateChecker(@NotNull final AbstractEcoPlugin plugin) { + public UpdateChecker(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java index 9b2e686e..d190d990 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java @@ -39,7 +39,6 @@ import com.willfp.eco.util.integrations.IntegrationLoader; import com.willfp.eco.util.integrations.anticheat.AnticheatManager; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.eco.util.integrations.mcmmo.McmmoManager; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import lombok.Getter; import org.bukkit.event.Listener; @@ -49,7 +48,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -public class EcoPlugin extends AbstractEcoPlugin { +public class EcoPlugin extends com.willfp.eco.util.plugin.EcoPlugin { /** * Instance of eco. */ diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java index 0a248973..0cbe7702 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketAutoRecipe.java @@ -5,7 +5,7 @@ import com.comphenix.protocol.ProtocolLibrary; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.proxy.proxies.AutoCraftProxy; import com.willfp.eco.spigot.InternalProxyUtils; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -18,14 +18,14 @@ public class PacketAutoRecipe extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketAutoRecipe(@NotNull final AbstractEcoPlugin plugin) { + public PacketAutoRecipe(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Server.AUTO_RECIPE, false); } @Override public void onSend(@NotNull final PacketContainer packet, @NotNull final Player player) { - if (!AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(packet.getMinecraftKeys().getValues().get(0).getFullKey().split(":")[0])) { + if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(packet.getMinecraftKeys().getValues().get(0).getFullKey().split(":")[0])) { return; } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java index 964e3e72..9ebec0b3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketChat.java @@ -6,7 +6,7 @@ import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.wrappers.WrappedChatComponent; import com.willfp.eco.proxy.proxies.ChatComponentProxy; import com.willfp.eco.spigot.InternalProxyUtils; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -17,7 +17,7 @@ public class PacketChat extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketChat(@NotNull final AbstractEcoPlugin plugin) { + public PacketChat(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Server.CHAT, ListenerPriority.MONITOR, true); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java index 3fa188da..2ad383fa 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketOpenWindowMerchant.java @@ -4,7 +4,7 @@ import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.proxy.proxies.VillagerTradeProxy; import com.willfp.eco.spigot.InternalProxyUtils; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.bukkit.inventory.MerchantRecipe; @@ -19,7 +19,7 @@ public class PacketOpenWindowMerchant extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketOpenWindowMerchant(@NotNull final AbstractEcoPlugin plugin) { + public PacketOpenWindowMerchant(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Server.OPEN_WINDOW_MERCHANT, false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetCreativeSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetCreativeSlot.java index ec4c983d..9b42205b 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetCreativeSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetCreativeSlot.java @@ -3,7 +3,7 @@ package com.willfp.eco.spigot.display; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.display.Display; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ public class PacketSetCreativeSlot extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketSetCreativeSlot(@NotNull final AbstractEcoPlugin plugin) { + public PacketSetCreativeSlot(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Client.SET_CREATIVE_SLOT, false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetSlot.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetSlot.java index 8ee9ffe0..1f0949e1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetSlot.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketSetSlot.java @@ -3,7 +3,7 @@ package com.willfp.eco.spigot.display; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.display.Display; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ public class PacketSetSlot extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketSetSlot(@NotNull final AbstractEcoPlugin plugin) { + public PacketSetSlot(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Server.SET_SLOT, false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketWindowItems.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketWindowItems.java index 02d88a3a..9d462fdb 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketWindowItems.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/display/PacketWindowItems.java @@ -3,7 +3,7 @@ package com.willfp.eco.spigot.display; import com.comphenix.protocol.PacketType; import com.comphenix.protocol.events.PacketContainer; import com.willfp.eco.util.display.Display; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.protocollib.AbstractPacketAdapter; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; @@ -14,7 +14,7 @@ public class PacketWindowItems extends AbstractPacketAdapter { * * @param plugin The plugin to listen through. */ - public PacketWindowItems(@NotNull final AbstractEcoPlugin plugin) { + public PacketWindowItems(@NotNull final EcoPlugin plugin) { super(plugin, PacketType.Play.Server.WINDOW_ITEMS, false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/drops/CollatedRunnable.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/drops/CollatedRunnable.java index aa005437..e5f1edc5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/drops/CollatedRunnable.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/drops/CollatedRunnable.java @@ -3,7 +3,7 @@ package com.willfp.eco.spigot.drops; import com.willfp.eco.internal.drops.impl.FastCollatedDropQueue; import com.willfp.eco.internal.drops.impl.InternalDropQueue; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import lombok.Getter; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitTask; @@ -21,9 +21,9 @@ public class CollatedRunnable { /** * Create and run a new runnable to process collated drops. * - * @param plugin The {@link AbstractEcoPlugin} that manages the processing. + * @param plugin The {@link EcoPlugin} that manages the processing. */ - public CollatedRunnable(@NotNull final AbstractEcoPlugin plugin) { + public CollatedRunnable(@NotNull final EcoPlugin plugin) { runnableTask = plugin.getScheduler().runTimer(() -> { for (Map.Entry entry : FastCollatedDropQueue.COLLATED_MAP.entrySet()) { new InternalDropQueue(entry.getKey()) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.java index be78bfac..7410058e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/eventlisteners/EntityDeathByEntityListeners.java @@ -1,7 +1,7 @@ package com.willfp.eco.spigot.eventlisteners; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; @@ -24,12 +24,12 @@ public class EntityDeathByEntityListeners extends PluginDependent implements Lis private final Set events = new HashSet<>(); /** - * Create a listener associated with an {@link AbstractEcoPlugin}. + * Create a listener associated with an {@link EcoPlugin}. * * @param plugin The plugin to associate with. */ @ApiStatus.Internal - public EntityDeathByEntityListeners(@NotNull final AbstractEcoPlugin plugin) { + public EntityDeathByEntityListeners(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java index c3d24eac..92927688 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefLands.java @@ -2,7 +2,7 @@ package com.willfp.eco.spigot.integrations.antigrief; import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import me.angeschossen.lands.api.integration.LandsIntegration; import me.angeschossen.lands.api.land.Area; import me.angeschossen.lands.api.role.enums.RoleSetting; @@ -23,7 +23,7 @@ public class AntigriefLands extends PluginDependent implements AntigriefWrapper * * @param plugin The integration provider. */ - public AntigriefLands(@NotNull final AbstractEcoPlugin plugin) { + public AntigriefLands(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/RecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/RecipeListener.java index de63819f..60e84cc4 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/RecipeListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/recipes/RecipeListener.java @@ -1,6 +1,6 @@ package com.willfp.eco.spigot.recipes; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.recipe.RecipeParts; import com.willfp.eco.util.recipe.Recipes; import com.willfp.eco.util.recipe.parts.RecipePart; @@ -31,7 +31,7 @@ public class RecipeListener implements Listener { ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - if (!AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { return; } @@ -63,7 +63,7 @@ public class RecipeListener implements Listener { ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - if (!AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { return; } @@ -163,7 +163,7 @@ public class RecipeListener implements Listener { ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - if (AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { return; } @@ -188,7 +188,7 @@ public class RecipeListener implements Listener { ShapedRecipe recipe = (ShapedRecipe) event.getRecipe(); - if (AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { + if (EcoPlugin.LOADED_ECO_PLUGINS.contains(recipe.getKey().getNamespace())) { return; } @@ -209,7 +209,7 @@ public class RecipeListener implements Listener { */ @EventHandler public void preventLearningDisplayedRecipes(@NotNull final PlayerRecipeDiscoverEvent event) { - if (!AbstractEcoPlugin.LOADED_ECO_PLUGINS.contains(event.getRecipe().getNamespace())) { + if (!EcoPlugin.LOADED_ECO_PLUGINS.contains(event.getRecipe().getNamespace())) { return; } diff --git a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/util/ProxyFactory.java b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/util/ProxyFactory.java index 310b6b4b..724f1d4f 100644 --- a/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/util/ProxyFactory.java +++ b/eco-core/core-proxy/src/main/java/com/willfp/eco/proxy/util/ProxyFactory.java @@ -1,7 +1,7 @@ package com.willfp.eco.proxy.util; import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.util.plugin.EcoPlugin; import com.willfp.eco.util.proxy.AbstractProxy; import com.willfp.eco.util.proxy.ProxyConstants; import com.willfp.eco.util.proxy.UnsupportedVersionException; @@ -27,7 +27,7 @@ public class ProxyFactory extends PluginDependent { * @param plugin The plugin to create proxies for. * @param proxyClass The class of the proxy interface. */ - public ProxyFactory(@NotNull final AbstractEcoPlugin plugin, + public ProxyFactory(@NotNull final EcoPlugin plugin, @NotNull final Class proxyClass) { super(plugin); this.proxyClass = proxyClass;