Refactored internal/util into internal/core/util

eco-api/src/main/java/com/willfp/eco/core/AbstractPacketAdapter.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.protocollib;
+package com.willfp.eco.core;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
@@ -6,7 +6,6 @@ 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.EcoPlugin;
 import lombok.Getter;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/EcoPlugin.java

@@ -1,27 +1,29 @@
-package com.willfp.eco.util.plugin;
+package com.willfp.eco.core;
 
+import com.willfp.eco.core.command.AbstractCommand;
+import com.willfp.eco.core.config.configs.Config;
+import com.willfp.eco.core.config.configs.Lang;
+import com.willfp.eco.core.config.updating.ConfigHandler;
+import com.willfp.eco.core.display.Display;
+import com.willfp.eco.core.display.DisplayModule;
+import com.willfp.eco.core.events.EventManager;
+import com.willfp.eco.core.extensions.ExtensionLoader;
+import com.willfp.eco.core.factory.MetadataValueFactory;
+import com.willfp.eco.core.factory.NamespacedKeyFactory;
+import com.willfp.eco.core.factory.RunnableFactory;
+import com.willfp.eco.core.integrations.IntegrationLoader;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import com.willfp.eco.core.scheduling.Scheduler;
+import com.willfp.eco.internal.UpdateChecker;
 import com.willfp.eco.internal.arrows.ArrowDataListener;
-import com.willfp.eco.internal.bukkit.events.EcoEventManager;
-import com.willfp.eco.internal.bukkit.scheduling.EcoScheduler;
+import com.willfp.eco.internal.events.EcoEventManager;
 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.meta.MetadataValueFactory;
-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.configs.Config;
-import com.willfp.eco.util.config.configs.Lang;
-import com.willfp.eco.util.config.updating.ConfigHandler;
-import com.willfp.eco.util.display.Display;
-import com.willfp.eco.util.display.DisplayModule;
-import com.willfp.eco.util.extensions.ExtensionLoader;
-import com.willfp.eco.util.integrations.IntegrationLoader;
-import com.willfp.eco.util.integrations.placeholder.PlaceholderManager;
-import com.willfp.eco.util.integrations.placeholder.plugins.PlaceholderIntegrationPAPI;
-import com.willfp.eco.util.optional.Prerequisite;
-import com.willfp.eco.util.protocollib.AbstractPacketAdapter;
-import com.willfp.eco.util.updater.UpdateChecker;
+import com.willfp.eco.internal.factory.EcoMetadataValueFactory;
+import com.willfp.eco.internal.factory.EcoNamespacedKeyFactory;
+import com.willfp.eco.internal.factory.EcoRunnableFactory;
+import com.willfp.eco.internal.integration.PlaceholderIntegrationPAPI;
+import com.willfp.eco.internal.scheduling.EcoScheduler;
+import com.willfp.eco.util.Prerequisite;
 import lombok.Getter;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.bstats.bukkit.Metrics;
@@ -128,7 +130,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     private final MetadataValueFactory metadataValueFactory;
 
     /**
-     * The internal factory to produce {@link com.willfp.eco.util.bukkit.scheduling.EcoBukkitRunnable}s.
+     * The internal factory to produce {@link com.willfp.eco.core.scheduling.EcoBukkitRunnable}s.
      */
     @Getter
     private final RunnableFactory runnableFactory;
@@ -136,7 +138,7 @@ public abstract class EcoPlugin extends JavaPlugin {
     /**
      * The loader for all plugin extensions.
      *
-     * @see com.willfp.eco.util.extensions.Extension
+     * @see com.willfp.eco.core.extensions.Extension
      */
     @Getter
     private final ExtensionLoader extensionLoader;
@@ -181,9 +183,9 @@ public abstract class EcoPlugin extends JavaPlugin {
 
         this.scheduler = new EcoScheduler(this);
         this.eventManager = new EcoEventManager(this);
-        this.namespacedKeyFactory = new NamespacedKeyFactory(this);
-        this.metadataValueFactory = new MetadataValueFactory(this);
-        this.runnableFactory = new RunnableFactory(this);
+        this.namespacedKeyFactory = new EcoNamespacedKeyFactory(this);
+        this.metadataValueFactory = new EcoMetadataValueFactory(this);
+        this.runnableFactory = new EcoRunnableFactory(this);
         this.extensionLoader = new EcoExtensionLoader(this);
         this.configHandler = new ConfigHandler(this);
 

eco-api/src/main/java/com/willfp/eco/core/PluginDependent.java

@@ -1,6 +1,5 @@
-package com.willfp.eco.util.internal;
+package com.willfp.eco.core;
 
-import com.willfp.eco.util.plugin.EcoPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/command/AbstractCommand.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.command;
+package com.willfp.eco.core.command;
 
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;

eco-api/src/main/java/com/willfp/eco/core/command/AbstractTabCompleter.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.command;
+package com.willfp.eco.core.command;
 
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;

eco-api/src/main/java/com/willfp/eco/core/config/BaseConfig.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.config;
+package com.willfp.eco.core.config;
 
 import com.willfp.eco.internal.config.UpdatableYamlConfig;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class BaseConfig extends UpdatableYamlConfig {

eco-api/src/main/java/com/willfp/eco/core/config/Config.java

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

eco-api/src/main/java/com/willfp/eco/core/config/ExtendableConfig.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.config;
+package com.willfp.eco.core.config;
 
 import com.willfp.eco.internal.config.UpdatableYamlConfig;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class ExtendableConfig extends UpdatableYamlConfig {

eco-api/src/main/java/com/willfp/eco/core/config/StaticBaseConfig.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.config;
+package com.willfp.eco.core.config;
 
 import com.willfp.eco.internal.config.LoadableYamlConfig;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public abstract class StaticBaseConfig extends LoadableYamlConfig {

eco-api/src/main/java/com/willfp/eco/core/config/YamlConfig.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.config;
+package com.willfp.eco.core.config;
 
 import com.willfp.eco.internal.config.ConfigWrapper;
 import org.bukkit.configuration.file.YamlConfiguration;

eco-api/src/main/java/com/willfp/eco/core/config/configs/Config.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.config.configs;
+package com.willfp.eco.core.config.configs;
 
-import com.willfp.eco.util.config.BaseConfig;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 

eco-api/src/main/java/com/willfp/eco/core/config/configs/Lang.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.config.configs;
+package com.willfp.eco.core.config.configs;
 
-import com.willfp.eco.util.config.BaseConfig;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.config.BaseConfig;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 public class Lang extends BaseConfig {

eco-api/src/main/java/com/willfp/eco/core/config/updating/ConfigHandler.java

@@ -1,10 +1,10 @@
-package com.willfp.eco.util.config.updating;
+package com.willfp.eco.core.config.updating;
 
-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.EcoPlugin;
+import com.willfp.eco.core.config.updating.annotations.ConfigUpdater;
+import com.willfp.eco.core.config.updating.exceptions.InvalidUpdatableClassException;
+import com.willfp.eco.core.config.updating.exceptions.InvalidUpdateMethodException;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.reflect.InvocationTargetException;

eco-api/src/main/java/com/willfp/eco/core/config/updating/annotations/ConfigUpdater.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.config.updating.annotations;
+package com.willfp.eco.core.config.updating.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

eco-api/src/main/java/com/willfp/eco/core/config/updating/exceptions/InvalidUpdatableClassException.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.config.updating.exceptions;
+package com.willfp.eco.core.config.updating.exceptions;
 
-import com.willfp.eco.util.config.updating.ConfigHandler;
+import com.willfp.eco.core.config.updating.ConfigHandler;
 import org.jetbrains.annotations.NotNull;
 
 public class InvalidUpdatableClassException extends RuntimeException {

eco-api/src/main/java/com/willfp/eco/core/config/updating/exceptions/InvalidUpdateMethodException.java

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

eco-api/src/main/java/com/willfp/eco/core/display/Display.java

@@ -1,6 +1,5 @@
-package com.willfp.eco.util.display;
+package com.willfp.eco.core.display;
 
-import com.willfp.eco.util.fast.FastItemStack;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.Validate;
 import org.bukkit.NamespacedKey;

eco-api/src/main/java/com/willfp/eco/core/display/DisplayModule.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.display;
+package com.willfp.eco.core.display;
 
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import lombok.Getter;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/display/DisplayPriority.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.display;
+package com.willfp.eco.core.display;
 
 public enum DisplayPriority {
     /**

eco-api/src/main/java/com/willfp/eco/core/drops/DropQueue.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.drops;
+package com.willfp.eco.core.drops;
 
 import com.willfp.eco.internal.drops.AbstractDropQueue;
 import com.willfp.eco.internal.drops.DropManager;

eco-api/src/main/java/com/willfp/eco/core/events/ArmorEquipEvent.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.events;
+package com.willfp.eco.core.events;
 
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;

eco-api/src/main/java/com/willfp/eco/core/events/EntityDeathByEntityEvent.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.events;
+package com.willfp.eco.core.events;
 
 import lombok.Getter;
 import org.bukkit.entity.Entity;

eco-api/src/main/java/com/willfp/eco/core/events/EventManager.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.bukkit.events;
+package com.willfp.eco.core.events;
 
 import org.bukkit.event.Listener;
 

eco-api/src/main/java/com/willfp/eco/core/events/NaturalExpGainEvent.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.events;
+package com.willfp.eco.core.events;
 
 import lombok.Getter;
 import org.bukkit.event.Event;

eco-api/src/main/java/com/willfp/eco/core/extensions/Extension.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.extensions;
+package com.willfp.eco.core.extensions;
 
 import com.willfp.eco.internal.extensions.ExtensionMetadata;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.apache.commons.lang.Validate;

eco-api/src/main/java/com/willfp/eco/core/extensions/ExtensionLoader.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.extensions;
+package com.willfp.eco.core.extensions;
 
 import java.util.Set;
 

eco-api/src/main/java/com/willfp/eco/core/extensions/MalformedExtensionException.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.extensions;
+package com.willfp.eco.core.extensions;
 
 import org.jetbrains.annotations.NotNull;
 

eco-api/src/main/java/com/willfp/eco/core/factory/MetadataValueFactory.java

@@ -0,0 +1,8 @@
+package com.willfp.eco.core.factory;
+
+import org.bukkit.metadata.FixedMetadataValue;
+import org.jetbrains.annotations.NotNull;
+
+public interface MetadataValueFactory {
+    FixedMetadataValue create(@NotNull Object value);
+}

eco-api/src/main/java/com/willfp/eco/core/factory/NamespacedKeyFactory.java

@@ -0,0 +1,14 @@
+package com.willfp.eco.core.factory;
+
+import org.bukkit.NamespacedKey;
+import org.jetbrains.annotations.NotNull;
+
+public interface NamespacedKeyFactory {
+    /**
+     * Create an {@link NamespacedKey} associated with an {@link com.willfp.eco.core.EcoPlugin}.
+     *
+     * @param key The key in the {@link NamespacedKey}.
+     * @return The created {@link NamespacedKey}.
+     */
+    NamespacedKey create(@NotNull String key);
+}

eco-api/src/main/java/com/willfp/eco/core/factory/RunnableFactory.java

@@ -0,0 +1,16 @@
+package com.willfp.eco.core.factory;
+
+import com.willfp.eco.core.scheduling.RunnableTask;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.function.Consumer;
+
+public interface RunnableFactory {
+    /**
+     * Create a {@link RunnableTask}.
+     *
+     * @param consumer Lambda of the code to run, where the parameter represents the instance of the runnable.
+     * @return The created {@link RunnableTask}.
+     */
+    RunnableTask create(@NotNull Consumer<RunnableTask> consumer);
+}

eco-api/src/main/java/com/willfp/eco/core/fast/FastItemStack.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.fast;
+package com.willfp.eco.core.fast;
 
 import com.willfp.eco.internal.fast.AbstractFastItemStackHandler;
 import com.willfp.eco.internal.fast.FastItemStackHandlerFactory;

eco-api/src/main/java/com/willfp/eco/core/integrations/Integration.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations;
+package com.willfp.eco.core.integrations;
 
 public interface Integration {
     /**

eco-api/src/main/java/com/willfp/eco/core/integrations/IntegrationLoader.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations;
+package com.willfp.eco.core.integrations;
 
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatManager.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.integrations.anticheat;
+package com.willfp.eco.core.integrations.anticheat;
 
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;

eco-api/src/main/java/com/willfp/eco/core/integrations/anticheat/AnticheatWrapper.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.integrations.anticheat;
+package com.willfp.eco.core.integrations.anticheat;
 
-import com.willfp.eco.util.integrations.Integration;
+import com.willfp.eco.core.integrations.Integration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 

eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefManager.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations.antigrief;
+package com.willfp.eco.core.integrations.antigrief;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.Location;

eco-api/src/main/java/com/willfp/eco/core/integrations/antigrief/AntigriefWrapper.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.integrations.antigrief;
+package com.willfp.eco.core.integrations.antigrief;
 
-import com.willfp.eco.util.integrations.Integration;
+import com.willfp.eco.core.integrations.Integration;
 import org.bukkit.Location;
 import org.bukkit.block.Block;
 import org.bukkit.entity.LivingEntity;

eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoManager.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations.mcmmo;
+package com.willfp.eco.core.integrations.mcmmo;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.block.Block;

eco-api/src/main/java/com/willfp/eco/core/integrations/mcmmo/McmmoWrapper.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations.mcmmo;
+package com.willfp.eco.core.integrations.mcmmo;
 
 import org.bukkit.block.Block;
 import org.bukkit.event.Event;

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderEntry.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations.placeholder;
+package com.willfp.eco.core.integrations.placeholder;
 
 import lombok.Getter;
 import org.apache.commons.lang.Validate;

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderIntegration.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.integrations.placeholder;
+package com.willfp.eco.core.integrations.placeholder;
 
-import com.willfp.eco.util.integrations.Integration;
+import com.willfp.eco.core.integrations.Integration;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.integrations.placeholder;
+package com.willfp.eco.core.integrations.placeholder;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.entity.Player;

eco-api/src/main/java/com/willfp/eco/core/proxy/AbstractProxy.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.proxy;
+package com.willfp.eco.core.proxy;
 
 public interface AbstractProxy {
 

eco-api/src/main/java/com/willfp/eco/core/proxy/ProxyConstants.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.proxy;
+package com.willfp.eco.core.proxy;
 
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;

eco-api/src/main/java/com/willfp/eco/core/proxy/UnsupportedVersionException.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.proxy;
+package com.willfp.eco.core.proxy;
 
 import org.jetbrains.annotations.NotNull;
 

eco-api/src/main/java/com/willfp/eco/core/recipe/RecipeParts.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.util.recipe;
+package com.willfp.eco.core.recipe;
 
-import com.willfp.eco.util.recipe.parts.EmptyRecipePart;
-import com.willfp.eco.util.recipe.parts.RecipePart;
-import com.willfp.eco.util.recipe.parts.SimpleRecipePart;
+import com.willfp.eco.core.recipe.parts.EmptyRecipePart;
+import com.willfp.eco.core.recipe.parts.RecipePart;
+import com.willfp.eco.core.recipe.parts.SimpleRecipePart;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;

eco-api/src/main/java/com/willfp/eco/core/recipe/Recipes.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.util.recipe;
+package com.willfp.eco.core.recipe;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.willfp.eco.util.recipe.recipes.ShapedCraftingRecipe;
+import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.NamespacedKey;

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/ComplexRecipePart.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.recipe.parts;
+package com.willfp.eco.core.recipe.parts;
 
 import lombok.Getter;
 import org.bukkit.inventory.ItemStack;

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/EmptyRecipePart.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.recipe.parts;
+package com.willfp.eco.core.recipe.parts;
 
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/RecipePart.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.recipe.parts;
+package com.willfp.eco.core.recipe.parts;
 
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Nullable;

eco-api/src/main/java/com/willfp/eco/core/recipe/parts/SimpleRecipePart.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.recipe.parts;
+package com.willfp.eco.core.recipe.parts;
 
 import lombok.Getter;
 import org.bukkit.Material;

eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/CraftingRecipe.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.recipe.recipes;
+package com.willfp.eco.core.recipe.recipes;
 
-import com.willfp.eco.util.recipe.parts.RecipePart;
+import com.willfp.eco.core.recipe.parts.RecipePart;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
 import org.bukkit.inventory.ItemStack;

eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/RecipePosition.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.recipe.recipes;
+package com.willfp.eco.core.recipe.recipes;
 
 import lombok.Getter;
 

eco-api/src/main/java/com/willfp/eco/core/recipe/recipes/ShapedCraftingRecipe.java

@@ -1,10 +1,10 @@
-package com.willfp.eco.util.recipe.recipes;
+package com.willfp.eco.core.recipe.recipes;
 
-import com.willfp.eco.util.internal.PluginDependent;
-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;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.recipe.Recipes;
+import com.willfp.eco.core.recipe.parts.EmptyRecipePart;
+import com.willfp.eco.core.recipe.parts.RecipePart;
 import lombok.Getter;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;

eco-api/src/main/java/com/willfp/eco/core/scheduling/RunnableTask.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.bukkit.scheduling;
+package com.willfp.eco.core.scheduling;
 
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/core/scheduling/Scheduler.java

@@ -1,6 +1,6 @@
-package com.willfp.eco.util.bukkit.scheduling;
+package com.willfp.eco.core.scheduling;
 
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.NotNull;
 

eco-api/src/main/java/com/willfp/eco/core/scheduling/TimedRunnable.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.bukkit.scheduling;
+package com.willfp.eco.core.scheduling;
 
 public interface TimedRunnable extends Runnable {
     /**

eco-api/src/main/java/com/willfp/eco/core/tuples/Pair.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.tuples;
+package com.willfp.eco.core.tuples;
 
 import lombok.Getter;
 import lombok.Setter;

eco-api/src/main/java/com/willfp/eco/core/tuples/Triplet.java

@@ -1,4 +1,4 @@
-package com.willfp.eco.util.tuples;
+package com.willfp.eco.core.tuples;
 
 import lombok.Getter;
 import lombok.Setter;

eco-api/src/main/java/com/willfp/eco/internal/UpdateChecker.java

@@ -1,7 +1,7 @@
-package com.willfp.eco.util.updater;
+package com.willfp.eco.internal;
 
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 

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.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Arrow;

eco-api/src/main/java/com/willfp/eco/internal/config/ConfigWrapper.java

@@ -1,7 +1,7 @@
 package com.willfp.eco.internal.config;
 
 import com.willfp.eco.util.StringUtils;
-import com.willfp.eco.util.config.Config;
+import com.willfp.eco.core.config.Config;
 import lombok.Getter;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.ConfigurationSection;

eco-api/src/main/java/com/willfp/eco/internal/config/LoadableYamlConfig.java

@@ -1,6 +1,6 @@
 package com.willfp.eco.internal.config;
 
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import lombok.AccessLevel;
 import lombok.Getter;
 import org.bukkit.configuration.InvalidConfigurationException;

eco-api/src/main/java/com/willfp/eco/internal/config/UpdatableYamlConfig.java

@@ -1,6 +1,6 @@
 package com.willfp.eco.internal.config;
 
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.configuration.InvalidConfigurationException;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/internal/events/EcoEventManager.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.internal.bukkit.events;
+package com.willfp.eco.internal.events;
 
-import com.willfp.eco.util.bukkit.events.EventManager;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.events.EventManager;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.event.HandlerList;
 import org.bukkit.event.Listener;

eco-api/src/main/java/com/willfp/eco/internal/events/EcoRunnableTask.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.internal.bukkit.events;
+package com.willfp.eco.internal.events;
 
-import com.willfp.eco.util.bukkit.scheduling.RunnableFactory;
-import com.willfp.eco.util.bukkit.scheduling.RunnableTask;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.internal.factory.EcoRunnableFactory;
+import com.willfp.eco.core.scheduling.RunnableTask;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.ApiStatus;
@@ -17,7 +17,7 @@ public abstract class EcoRunnableTask extends BukkitRunnable implements Runnable
     /**
      * Creates a new {@link EcoRunnableTask}.
      * <p>
-     * Cannot be instantiated normally, use {@link RunnableFactory}.
+     * Cannot be instantiated normally, use {@link EcoRunnableFactory}.
      *
      * @param plugin The {@link EcoPlugin} to associate runnables with.
      */

eco-api/src/main/java/com/willfp/eco/internal/extensions/EcoExtensionLoader.java

@@ -1,11 +1,11 @@
 package com.willfp.eco.internal.extensions;
 
 
-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.EcoPlugin;
+import com.willfp.eco.core.extensions.Extension;
+import com.willfp.eco.core.extensions.MalformedExtensionException;
+import com.willfp.eco.core.extensions.ExtensionLoader;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.apache.commons.lang.Validate;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.jetbrains.annotations.NotNull;

eco-api/src/main/java/com/willfp/eco/internal/factory/EcoMetadataValueFactory.java

@@ -1,17 +1,18 @@
-package com.willfp.eco.util.bukkit.meta;
+package com.willfp.eco.internal.factory;
 
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.factory.MetadataValueFactory;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.jetbrains.annotations.NotNull;
 
-public class MetadataValueFactory extends PluginDependent {
+public class EcoMetadataValueFactory extends PluginDependent implements MetadataValueFactory {
     /**
      * 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 EcoPlugin plugin) {
+    public EcoMetadataValueFactory(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 
@@ -21,6 +22,7 @@ public class MetadataValueFactory extends PluginDependent {
      * @param value The value of meta key.
      * @return The created {@link FixedMetadataValue}.
      */
+    @Override
     public FixedMetadataValue create(@NotNull final Object value) {
         return new FixedMetadataValue(this.getPlugin(), value);
     }

eco-api/src/main/java/com/willfp/eco/internal/factory/EcoNamespacedKeyFactory.java

@@ -0,0 +1,22 @@
+package com.willfp.eco.internal.factory;
+
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
+import com.willfp.eco.core.factory.NamespacedKeyFactory;
+import org.bukkit.NamespacedKey;
+import org.jetbrains.annotations.NotNull;
+
+public class EcoNamespacedKeyFactory extends PluginDependent implements NamespacedKeyFactory {
+    /**
+     * Factory class to produce {@link NamespacedKey}s associated with an {@link EcoPlugin}.
+     *
+     * @param plugin The plugin that this factory creates keys for.
+     */
+    public EcoNamespacedKeyFactory(@NotNull final EcoPlugin plugin) {
+        super(plugin);
+    }
+    @Override
+    public NamespacedKey create(@NotNull final String key) {
+        return new NamespacedKey(this.getPlugin(), key);
+    }
+}

eco-api/src/main/java/com/willfp/eco/internal/factory/EcoRunnableFactory.java

@@ -1,28 +1,25 @@
-package com.willfp.eco.util.bukkit.scheduling;
+package com.willfp.eco.internal.factory;
 
-import com.willfp.eco.internal.bukkit.events.EcoRunnableTask;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.factory.RunnableFactory;
+import com.willfp.eco.core.scheduling.RunnableTask;
+import com.willfp.eco.internal.events.EcoRunnableTask;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
 
-public class RunnableFactory extends PluginDependent {
+public class EcoRunnableFactory extends PluginDependent implements RunnableFactory {
     /**
      * Factory class to produce {@link RunnableTask}s associated with an {@link EcoPlugin}.
      *
      * @param plugin The plugin that this factory creates runnables for.
      */
-    public RunnableFactory(@NotNull final EcoPlugin plugin) {
+    public EcoRunnableFactory(@NotNull final EcoPlugin plugin) {
         super(plugin);
     }
 
-    /**
-     * Create a {@link RunnableTask}.
-     *
-     * @param consumer Lambda of the code to run, where the parameter represents the instance of the runnable.
-     * @return The created {@link RunnableTask}.
-     */
+    @Override
     public RunnableTask create(@NotNull final Consumer<RunnableTask> consumer) {
         return new EcoRunnableTask(this.getPlugin()) {
             @Override

eco-api/src/main/java/com/willfp/eco/internal/integration/PlaceholderIntegrationPAPI.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.util.integrations.placeholder.plugins;
+package com.willfp.eco.internal.integration;
 
-import com.willfp.eco.util.integrations.placeholder.PlaceholderIntegration;
-import com.willfp.eco.util.integrations.placeholder.PlaceholderManager;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderIntegration;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
+import com.willfp.eco.core.EcoPlugin;
 import me.clip.placeholderapi.PlaceholderAPI;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import org.bukkit.entity.Player;

eco-api/src/main/java/com/willfp/eco/internal/scheduling/EcoScheduler.java

@@ -1,8 +1,8 @@
-package com.willfp.eco.internal.bukkit.scheduling;
+package com.willfp.eco.internal.scheduling;
 
-import com.willfp.eco.util.bukkit.scheduling.Scheduler;
-import com.willfp.eco.util.internal.PluginDependent;
-import com.willfp.eco.util.plugin.EcoPlugin;
+import com.willfp.eco.core.scheduling.Scheduler;
+import com.willfp.eco.core.PluginDependent;
+import com.willfp.eco.core.EcoPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitTask;
 import org.jetbrains.annotations.ApiStatus;

eco-api/src/main/java/com/willfp/eco/util/BlockUtils.java

@@ -15,7 +15,7 @@ import java.util.Set;
 import java.util.function.BiConsumer;
 
 @UtilityClass
-public class  BlockUtils {
+public class BlockUtils {
     /**
      * If the meta set function has been set.
      */
@@ -37,6 +37,15 @@ public class  BlockUtils {
                 if (blocks.size() > limit || blocks.size() > 2500) {
                     return blocks;
                 }
+            }
+        }
+        // Running twice to get more spherical shape.
+        for (BlockFace face : BlockFace.values()) {
+            Block block = start.getRelative(face);
+            if (!blocks.contains(block) && allowedMaterials.contains(block.getType())) {
+                if (blocks.size() > limit || blocks.size() > 2500) {
+                    return blocks;
+                }
                 blocks.addAll(getNearbyBlocks(block, allowedMaterials, blocks, limit));
             }
         }
@@ -49,7 +58,6 @@ public class  BlockUtils {
      * @param start            The initial block.
      * @param allowedMaterials A list of all valid {@link Material}s.
      * @param limit            The maximum size of vein to return.
-     *
      * @return A set of all {@link Block}s.
      */
     public Set<Block> getVein(@NotNull final Block start,

eco-api/src/main/java/com/willfp/eco/util/PlayerUtils.java

@@ -1,6 +1,5 @@
 package com.willfp.eco.util;
 
-import com.willfp.eco.util.optional.Prerequisite;
 import lombok.experimental.UtilityClass;
 import org.apache.commons.lang.Validate;
 import org.bukkit.entity.Player;

eco-api/src/main/java/com/willfp/eco/util/Prerequisite.java

@@ -1,7 +1,6 @@
-package com.willfp.eco.util.optional;
+package com.willfp.eco.util;
 
-import com.willfp.eco.util.ClassUtils;
-import com.willfp.eco.util.proxy.ProxyConstants;
+import com.willfp.eco.core.proxy.ProxyConstants;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 

eco-api/src/main/java/com/willfp/eco/util/StringUtils.java

@@ -1,7 +1,6 @@
 package com.willfp.eco.util;
 
-import com.willfp.eco.util.integrations.placeholder.PlaceholderManager;
-import com.willfp.eco.util.optional.Prerequisite;
+import com.willfp.eco.core.integrations.placeholder.PlaceholderManager;
 import lombok.experimental.UtilityClass;
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.entity.Player;

eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java

@@ -2,7 +2,6 @@ package com.willfp.eco.util;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
-import com.willfp.eco.util.optional.Prerequisite;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

eco-api/src/main/java/com/willfp/eco/util/VectorUtils.java

@@ -7,6 +7,7 @@ import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @UtilityClass
@@ -78,7 +79,7 @@ public class VectorUtils {
             return cached;
         }
 
-        ArrayList<Vector> circleVecs = new ArrayList<>();
+        List<Vector> vectors = new ArrayList<>();
 
         double xoffset = -radius;
         double zoffset = -radius;
@@ -86,7 +87,7 @@ public class VectorUtils {
         while (zoffset <= radius) {
             while (xoffset <= radius) {
                 if (Math.round(Math.sqrt((xoffset * xoffset) + (zoffset * zoffset))) <= radius) {
-                    circleVecs.add(new Vector(xoffset, 0, zoffset));
+                    vectors.add(new Vector(xoffset, 0, zoffset));
                 } else {
                     xoffset++;
                     continue;
@@ -97,7 +98,7 @@ public class VectorUtils {
             zoffset++;
         }
 
-        Vector[] result = circleVecs.toArray(new Vector[0]);
+        Vector[] result = vectors.toArray(new Vector[0]);
         CIRCLE_CACHE.put(radius, result);
         return result;
     }
@@ -109,21 +110,21 @@ public class VectorUtils {
      * @return An array of {@link Vector}s.
      */
     public Vector[] getSquare(final int radius) {
-        ArrayList<Vector> circleVecs = new ArrayList<>();
+        List<Vector> vectors = new ArrayList<>();
 
         int xoffset = -radius;
         int zoffset = -radius;
 
         while (zoffset <= radius) {
             while (xoffset <= radius) {
-                circleVecs.add(new Vector(xoffset, 0, zoffset));
+                vectors.add(new Vector(xoffset, 0, zoffset));
                 xoffset++;
             }
             xoffset = -radius;
             zoffset++;
         }
 
-        return circleVecs.toArray(new Vector[0]);
+        return vectors.toArray(new Vector[0]);
     }
 
     /**
@@ -133,16 +134,16 @@ public class VectorUtils {
      * @return An array of {@link Vector}s.
      */
     public Vector[] getCube(final int radius) {
-        ArrayList<Vector> cubeVecs = new ArrayList<>();
+        List<Vector> vectors = new ArrayList<>();
 
         for (int y = -radius; y <= radius; y++) {
             for (int z = -radius; z <= radius; z++) {
                 for (int x = -radius; x <= radius; x++) {
-                    cubeVecs.add(new Vector(x, y, z));
+                    vectors.add(new Vector(x, y, z));
                 }
             }
         }
 
-        return cubeVecs.toArray(new Vector[0]);
+        return vectors.toArray(new Vector[0]);
     }
 }

eco-api/src/main/java/com/willfp/eco/util/bukkit/keys/NamespacedKeyFactory.java

@@ -1,27 +0,0 @@
-package com.willfp.eco.util.bukkit.keys;
-
-import com.willfp.eco.util.internal.PluginDependent;
-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 EcoPlugin}.
-     *
-     * @param plugin The plugin that this factory creates keys for.
-     */
-    public NamespacedKeyFactory(@NotNull final EcoPlugin plugin) {
-        super(plugin);
-    }
-
-    /**
-     * Create an {@link NamespacedKey} associated with an {@link EcoPlugin}.
-     *
-     * @param key The key in the {@link NamespacedKey}.
-     * @return The created {@link NamespacedKey}.
-     */
-    public NamespacedKey create(@NotNull final String key) {
-        return new NamespacedKey(this.getPlugin(), key);
-    }
-}