diff --git a/build.gradle b/build.gradle index 21a18db..8e4f6b3 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:4.3.1' + compileOnly 'com.willfp:eco:5.0.0' compileOnly 'org.jetbrains:annotations:19.0.0' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java index 76047cb..a375375 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java @@ -1,12 +1,10 @@ package com.willfp.talismans; -import com.willfp.eco.util.bukkit.scheduling.TimedRunnable; -import com.willfp.eco.util.command.AbstractCommand; -import com.willfp.eco.util.display.DisplayModule; -import com.willfp.eco.util.integrations.IntegrationLoader; -import com.willfp.eco.util.optional.Prerequisite; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import com.willfp.eco.util.protocollib.AbstractPacketAdapter; +import com.willfp.eco.core.AbstractPacketAdapter; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.command.AbstractCommand; +import com.willfp.eco.core.display.DisplayModule; +import com.willfp.eco.core.integrations.IntegrationLoader; import com.willfp.talismans.commands.CommandTalgive; import com.willfp.talismans.commands.CommandTalreload; import com.willfp.talismans.commands.TabcompleterTalgive; @@ -30,7 +28,7 @@ import java.util.Arrays; import java.util.List; @SuppressWarnings("unused") -public class TalismansPlugin extends AbstractEcoPlugin { +public class TalismansPlugin extends EcoPlugin { /** * Instance of the plugin. */ @@ -53,13 +51,13 @@ public class TalismansPlugin extends AbstractEcoPlugin { this.getExtensionLoader().loadExtensions(); if (this.getExtensionLoader().getLoadedExtensions().isEmpty()) { - this.getLog().info("&cNo extensions found"); + this.getLogger().info("&cNo extensions found"); } else { - this.getLog().info("Extensions Loaded:"); - this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLog().info("- " + extension.getName() + " v" + extension.getVersion())); + this.getLogger().info("Extensions Loaded:"); + this.getExtensionLoader().getLoadedExtensions().forEach(extension -> this.getLogger().info("- " + extension.getName() + " v" + extension.getVersion())); } - this.getLog().info(Talismans.values().size() + " Talismans Loaded"); + this.getLogger().info(Talismans.values().size() + " Talismans Loaded"); } /** @@ -89,10 +87,6 @@ public class TalismansPlugin extends AbstractEcoPlugin { this.getScheduler().runLater(() -> { if (talisman.isEnabled()) { this.getEventManager().registerListener(talisman); - - if (talisman instanceof TimedRunnable) { - this.getScheduler().syncRepeating((TimedRunnable) talisman, 5, ((TimedRunnable) talisman).getTime()); - } } }, 1); }); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalgive.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalgive.java index d097da0..83948d3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalgive.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalgive.java @@ -1,8 +1,8 @@ package com.willfp.talismans.commands; -import com.willfp.eco.util.command.AbstractCommand; -import com.willfp.eco.util.command.AbstractTabCompleter; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.command.AbstractCommand; +import com.willfp.eco.core.command.AbstractTabCompleter; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import org.bukkit.Bukkit; @@ -20,7 +20,7 @@ public class CommandTalgive extends AbstractCommand { * * @param plugin The plugin for the commands to listen for. */ - public CommandTalgive(@NotNull final AbstractEcoPlugin plugin) { + public CommandTalgive(@NotNull final EcoPlugin plugin) { super(plugin, "talgive", "talismans.give", false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalreload.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalreload.java index 694635d..4837f64 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalreload.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/CommandTalreload.java @@ -1,7 +1,7 @@ package com.willfp.talismans.commands; -import com.willfp.eco.util.command.AbstractCommand; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.command.AbstractCommand; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; @@ -13,7 +13,7 @@ public class CommandTalreload extends AbstractCommand { * * @param plugin The plugin for the commands to listen for. */ - public CommandTalreload(@NotNull final AbstractEcoPlugin plugin) { + public CommandTalreload(@NotNull final EcoPlugin plugin) { super(plugin, "talreload", "talismans.reload", false); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/TabcompleterTalgive.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/TabcompleterTalgive.java index 403f35e..7fbb523 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/TabcompleterTalgive.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/commands/TabcompleterTalgive.java @@ -1,7 +1,7 @@ package com.willfp.talismans.commands; -import com.willfp.eco.util.command.AbstractTabCompleter; -import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; +import com.willfp.eco.core.command.AbstractTabCompleter; +import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import org.bukkit.Bukkit; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismansConfigs.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismansConfigs.java index 51d9062..fcf548c 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismansConfigs.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/TalismansConfigs.java @@ -1,6 +1,6 @@ package com.willfp.talismans.config; -import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; +import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.talismans.config.configs.TalismanConfig; import lombok.Getter; import lombok.experimental.UtilityClass; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/configs/TalismanConfig.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/configs/TalismanConfig.java index fab3a31..e89ba3e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/configs/TalismanConfig.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/config/configs/TalismanConfig.java @@ -1,6 +1,6 @@ package com.willfp.talismans.config.configs; -import com.willfp.eco.util.config.ExtendableConfig; +import com.willfp.eco.core.config.ExtendableConfig; import com.willfp.talismans.TalismansPlugin; import com.willfp.talismans.talismans.meta.TalismanStrength; import lombok.Getter; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java index f12eb89..9e72175 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java @@ -1,9 +1,9 @@ package com.willfp.talismans.display; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.display.DisplayModule; +import com.willfp.eco.core.display.DisplayPriority; import com.willfp.eco.util.SkullUtils; -import com.willfp.eco.util.display.DisplayModule; -import com.willfp.eco.util.display.DisplayPriority; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.util.TalismanChecks; import com.willfp.talismans.talismans.util.TalismanUtils; @@ -20,7 +20,7 @@ public class TalismanDisplay extends DisplayModule { * Instantiate talisman display. * @param plugin Instance of Talismans. */ - public TalismanDisplay(@NotNull final AbstractEcoPlugin plugin) { + public TalismanDisplay(@NotNull final EcoPlugin plugin) { super(plugin, DisplayPriority.LOWEST); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java index 9de2420..d781907 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talisman.java @@ -1,12 +1,12 @@ package com.willfp.talismans.talismans; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.Prerequisite; +import com.willfp.eco.core.display.Display; +import com.willfp.eco.core.items.CustomItem; +import com.willfp.eco.core.items.Items; +import com.willfp.eco.core.recipe.recipes.ShapedCraftingRecipe; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.display.Display; -import com.willfp.eco.util.optional.Prerequisite; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import com.willfp.eco.util.recipe.RecipeParts; -import com.willfp.eco.util.recipe.parts.ComplexRecipePart; -import com.willfp.eco.util.recipe.recipes.EcoShapedRecipe; import com.willfp.talismans.TalismansPlugin; import com.willfp.talismans.config.TalismansConfigs; import com.willfp.talismans.config.configs.TalismanConfig; @@ -45,7 +45,7 @@ public abstract class Talisman implements Listener, Watcher { * Instance of Talismans for talismans to be able to access. */ @Getter(AccessLevel.PROTECTED) - private final AbstractEcoPlugin plugin = TalismansPlugin.getInstance(); + private final EcoPlugin plugin = TalismansPlugin.getInstance(); /** * The key to store talismans in meta. @@ -107,7 +107,7 @@ public abstract class Talisman implements Listener, Watcher { * The talisman recipe. */ @Getter - private EcoShapedRecipe recipe = null; + private ShapedCraftingRecipe recipe = null; /** * If the talisman is craftable. @@ -210,16 +210,16 @@ public abstract class Talisman implements Listener, Watcher { this.itemStack = out; - RecipeParts.registerRecipePart(this.getKey(), new ComplexRecipePart(test -> Objects.equals(this, TalismanChecks.getTalismanOnItem(test)), out)); + new CustomItem(this.getKey(), test -> Objects.equals(this, TalismanChecks.getTalismanOnItem(test)), out).register(); if (this.isCraftable() && this.isEnabled()) { - EcoShapedRecipe.Builder builder = EcoShapedRecipe.builder(this.getPlugin(), this.getKey().getKey()) + ShapedCraftingRecipe.Builder builder = ShapedCraftingRecipe.builder(this.getPlugin(), this.getKey().getKey()) .setOutput(out); List recipeStrings = this.getConfig().getStrings(Talismans.OBTAINING_LOCATION + "recipe"); for (int i = 0; i < 9; i++) { - builder.setRecipePart(i, RecipeParts.lookup(recipeStrings.get(i))); + builder.setRecipePart(i, Items.lookup(recipeStrings.get(i))); } this.recipe = builder.build(); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java index 56bb7df..20a3d18 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/Talismans.java @@ -1,10 +1,9 @@ package com.willfp.talismans.talismans; - import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; import com.google.common.collect.ImmutableList; -import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; +import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.talismans.talismans.meta.TalismanStrength; import com.willfp.talismans.talismans.talismans.AlchemyTalisman; import com.willfp.talismans.talismans.talismans.ArcheryTalisman; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java index b699304..deb050f 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/meta/TalismanStrength.java @@ -1,6 +1,6 @@ package com.willfp.talismans.talismans.meta; -import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; +import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.talismans.TalismansPlugin; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java index 84da726..c806008 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExperienceTalisman.java @@ -1,6 +1,6 @@ package com.willfp.talismans.talismans.talismans; -import com.willfp.eco.util.events.naturalexpgainevent.NaturalExpGainEvent; +import com.willfp.eco.core.events.NaturalExpGainEvent; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.meta.TalismanStrength; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java index 527e5e3..c410015 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/ExtractionTalisman.java @@ -1,6 +1,6 @@ package com.willfp.talismans.talismans.talismans; -import com.willfp.eco.util.drops.DropQueue; +import com.willfp.eco.core.drops.DropQueue; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.meta.TalismanStrength; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java index f9ed392..a1ebea2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java @@ -1,6 +1,6 @@ package com.willfp.talismans.talismans.talismans; -import com.willfp.eco.util.integrations.mcmmo.McmmoManager; +import com.willfp.eco.core.integrations.mcmmo.McmmoManager; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.meta.TalismanStrength; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/BlockPlaceListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/BlockPlaceListener.java index 7c85ff5..4bed84a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/BlockPlaceListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/BlockPlaceListener.java @@ -1,6 +1,5 @@ package com.willfp.talismans.talismans.util; -import org.bukkit.Tag; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java index 8cfe955..0112802 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/DiscoverRecipeListener.java @@ -1,7 +1,7 @@ package com.willfp.talismans.talismans.util; -import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.PluginDependent; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import org.bukkit.entity.Player; @@ -16,7 +16,7 @@ public class DiscoverRecipeListener extends PluginDependent implements Listener * * @param plugin Talismans. */ - public DiscoverRecipeListener(@NotNull final AbstractEcoPlugin plugin) { + public DiscoverRecipeListener(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java index 621ed7e..c641336 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanChecks.java @@ -1,8 +1,7 @@ package com.willfp.talismans.talismans.util; -import com.willfp.eco.util.config.updating.annotations.ConfigUpdater; -import com.willfp.eco.util.optional.Prerequisite; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.talismans.TalismansPlugin; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; @@ -54,7 +53,7 @@ public class TalismanChecks { /** * The associated plugin instance. */ - private static final AbstractEcoPlugin PLUGIN = TalismansPlugin.getInstance(); + private static final EcoPlugin PLUGIN = TalismansPlugin.getInstance(); /** * Does the specified ItemStack have a certain Talisman present? @@ -103,18 +102,8 @@ public class TalismanChecks { PersistentDataContainer container = meta.getPersistentDataContainer(); - if (Prerequisite.MINIMUM_1_16.isMet()) { - NamespacedKey talismanKey = container.getKeys().stream().filter(namespacedKey -> namespacedKey.getNamespace().equals("talismans")).findFirst().orElse(null); - return Talismans.getByKey(talismanKey); - } else { - for (Talisman talisman : Talismans.values()) { - if (container.has(talisman.getKey(), PersistentDataType.INTEGER)) { - return talisman; - } - } - } - - return null; + NamespacedKey talismanKey = container.getKeys().stream().filter(namespacedKey -> namespacedKey.getNamespace().equals("talismans")).findFirst().orElse(null); + return Talismans.getByKey(talismanKey); } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java index 13b394e..5767fb1 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanCraftListener.java @@ -1,7 +1,7 @@ package com.willfp.talismans.talismans.util; -import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.PluginDependent; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import org.bukkit.Material; @@ -21,7 +21,7 @@ public class TalismanCraftListener extends PluginDependent implements Listener { * * @param plugin Instance of talismans. */ - public TalismanCraftListener(@NotNull final AbstractEcoPlugin plugin) { + public TalismanCraftListener(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanUtils.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanUtils.java index cfdda04..f51d9e2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanUtils.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/TalismanUtils.java @@ -1,10 +1,10 @@ package com.willfp.talismans.talismans.util; +import com.willfp.eco.core.integrations.placeholder.PlaceholderEntry; +import com.willfp.eco.core.integrations.placeholder.PlaceholderManager; import com.willfp.eco.util.NumberUtils; import com.willfp.eco.util.StringUtils; -import com.willfp.eco.util.integrations.placeholder.PlaceholderEntry; -import com.willfp.eco.util.integrations.placeholder.PlaceholderManager; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import lombok.experimental.UtilityClass; @@ -48,7 +48,7 @@ public class TalismanUtils { talisman.getConfig().getKeys(true).forEach(string -> { String key = string.replace("\\.", "_").replace("-", "_"); - Object object = talisman.getConfig().getRaw(string); + Object object = talisman.getConfig().get(string); PlaceholderManager.registerPlaceholder( new PlaceholderEntry( diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java index 7f7a6b3..63044e6 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java @@ -1,10 +1,10 @@ package com.willfp.talismans.talismans.util; import com.google.common.collect.Sets; -import com.willfp.eco.util.integrations.antigrief.AntigriefManager; -import com.willfp.eco.util.integrations.mcmmo.McmmoManager; -import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.PluginDependent; +import com.willfp.eco.core.integrations.antigrief.AntigriefManager; +import com.willfp.eco.core.integrations.mcmmo.McmmoManager; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Arrow; @@ -46,7 +46,7 @@ public class WatcherTriggers extends PluginDependent implements Listener { * * @param plugin The plugin to link the events to. */ - public WatcherTriggers(@NotNull final AbstractEcoPlugin plugin) { + public WatcherTriggers(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/SyncTalismanEquipEventTask.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/SyncTalismanEquipEventTask.java index a023a4c..5de5e97 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/SyncTalismanEquipEventTask.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/SyncTalismanEquipEventTask.java @@ -1,6 +1,6 @@ package com.willfp.talismans.talismans.util.equipevent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.util.TalismanChecks; import org.bukkit.Bukkit; @@ -25,7 +25,7 @@ public class SyncTalismanEquipEventTask { * * @param plugin The plugin to schedule for. */ - public static void scheduleAutocheck(@NotNull final AbstractEcoPlugin plugin) { + public static void scheduleAutocheck(@NotNull final EcoPlugin plugin) { plugin.getScheduler().syncRepeating(() -> { for (Player player : plugin.getServer().getOnlinePlayers()) { UUID uuid = player.getUniqueId(); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java index 8cf2dda..8da4159 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/equipevent/TalismanEquipEventListeners.java @@ -1,7 +1,7 @@ package com.willfp.talismans.talismans.util.equipevent; -import com.willfp.eco.util.internal.PluginDependent; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.PluginDependent; import com.willfp.talismans.talismans.Talisman; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.util.TalismanChecks; @@ -29,7 +29,7 @@ public class TalismanEquipEventListeners extends PluginDependent implements List * * @param plugin The plugin to link to. */ - public TalismanEquipEventListeners(@NotNull final AbstractEcoPlugin plugin) { + public TalismanEquipEventListeners(@NotNull final EcoPlugin plugin) { super(plugin); } diff --git a/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilConfig.java b/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilConfig.java index 59da5ef..6d2df62 100644 --- a/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilConfig.java +++ b/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilConfig.java @@ -1,6 +1,6 @@ package com.willfp.talismans.fossil; -import com.willfp.eco.util.config.ExtendableConfig; +import com.willfp.eco.core.config.ExtendableConfig; import com.willfp.talismans.TalismansPlugin; public class FossilConfig extends ExtendableConfig { diff --git a/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilMain.java b/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilMain.java index d1bbaff..d748389 100644 --- a/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilMain.java +++ b/eco-extensions/fossil/src/main/java/com/willfp/talismans/fossil/FossilMain.java @@ -1,7 +1,7 @@ package com.willfp.talismans.fossil; -import com.willfp.eco.util.extensions.Extension; -import com.willfp.eco.util.plugin.AbstractEcoPlugin; +import com.willfp.eco.core.EcoPlugin; +import com.willfp.eco.core.extensions.Extension; import com.willfp.talismans.fossil.talismans.ExperienceFossil; import com.willfp.talismans.fossil.talismans.FeatherFossil; import com.willfp.talismans.fossil.talismans.FlameFossil; @@ -30,7 +30,7 @@ public class FossilMain extends Extension { * * @param plugin Instance of Talismans. */ - public FossilMain(@NotNull final AbstractEcoPlugin plugin) { + public FossilMain(@NotNull final EcoPlugin plugin) { super(plugin); }