diff --git a/build.gradle b/build.gradle index 11046e3..1701d97 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ allprojects { } dependencies { - compileOnly 'com.willfp:eco:3.1.0' + compileOnly 'com.willfp:eco:3.3.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 a5a6339..90329a2 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 @@ -13,8 +13,6 @@ import com.willfp.talismans.commands.CommandTalreload; import com.willfp.talismans.commands.TabcompleterTalgive; import com.willfp.talismans.config.TalismansConfigs; import com.willfp.talismans.display.TalismanDisplay; -import com.willfp.talismans.integrations.mcmmo.McmmoManager; -import com.willfp.talismans.integrations.mcmmo.plugins.McmmoIntegrationImpl; import com.willfp.talismans.talismans.Talismans; import com.willfp.talismans.talismans.util.BlockPlaceListener; import com.willfp.talismans.talismans.util.DiscoverRecipeListener; @@ -119,9 +117,7 @@ public class TalismansPlugin extends AbstractEcoPlugin { */ @Override public List getIntegrationLoaders() { - return Arrays.asList( - new IntegrationLoader("mcMMO", () -> McmmoManager.registerIntegration(new McmmoIntegrationImpl())) - ); + return new ArrayList<>(); } /** diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoIntegration.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoIntegration.java deleted file mode 100644 index 5882cf9..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoIntegration.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.willfp.talismans.integrations.mcmmo; - -import com.willfp.eco.util.integrations.Integration; -import org.bukkit.event.Event; - -public interface McmmoIntegration extends Integration { - /** - * @param event The event to check. - * @return If the event is fake. - * @see McmmoManager#isFake(Event) - */ - boolean isFake(Event event); -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoManager.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoManager.java deleted file mode 100644 index 58a4560..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoManager.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.willfp.talismans.integrations.mcmmo; - -import com.willfp.eco.util.ClassUtils; -import org.bukkit.event.Event; -import org.jetbrains.annotations.NotNull; - -import java.util.HashSet; -import java.util.Set; -import java.util.concurrent.atomic.AtomicBoolean; - -public class McmmoManager { - /** - * All registered mcMMO integrations. - */ - private static final Set REGISTERED = new HashSet<>(); - - /** - * Register a new mcMMO integration. - * - * @param integration The integration to register. - */ - public static void registerIntegration(@NotNull final McmmoIntegration integration) { - if (!ClassUtils.exists("com.gmail.nossr50.events.fake.FakeEvent")) { - return; - } - REGISTERED.add(integration); - } - - /** - * Get if an event is fake. - * - * @param event The event to check. - * @return If the event is fake. - */ - public static boolean isFake(@NotNull final Event event) { - AtomicBoolean isFake = new AtomicBoolean(false); - REGISTERED.forEach(integration -> { - if (integration.isFake(event)) { - isFake.set(true); - } - }); - - return isFake.get(); - } -} diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/plugins/McmmoIntegrationImpl.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/plugins/McmmoIntegrationImpl.java deleted file mode 100644 index 9409ed3..0000000 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/plugins/McmmoIntegrationImpl.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.willfp.talismans.integrations.mcmmo.plugins; - -import com.gmail.nossr50.events.fake.FakeEvent; -import com.willfp.talismans.integrations.mcmmo.McmmoIntegration; -import org.bukkit.event.Event; -import org.jetbrains.annotations.NotNull; - -public class McmmoIntegrationImpl implements McmmoIntegration { - @Override - public boolean isFake(@NotNull final Event event) { - return event instanceof FakeEvent; - } - - @Override - public String getPluginName() { - return "mcMMO"; - } -} 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 5358dbe..f9ed392 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.talismans.integrations.mcmmo.McmmoManager; +import com.willfp.eco.util.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/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java index e9af3e8..100e20a 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 @@ -4,7 +4,7 @@ import com.google.common.collect.Sets; import com.willfp.eco.util.integrations.antigrief.AntigriefManager; import com.willfp.eco.util.internal.PluginDependent; import com.willfp.eco.util.plugin.AbstractEcoPlugin; -import com.willfp.talismans.integrations.mcmmo.McmmoManager; +import com.willfp.eco.util.integrations.mcmmo.McmmoManager; import com.willfp.talismans.proxy.proxies.TridentStackProxy; import org.bukkit.Material; import org.bukkit.block.Block;