Repo-Mirror/Talismans
9
0
Fork 0
Code Issues Releases 1 Activity

Removed internal mcmmo integration in favor of eco default

Browse Source
This commit is contained in:
Auxilor
2021-01-29 09:51:45 +00:00
parent 8a20723d27
commit 4e378f4b29
7 changed files with 4 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -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'

6
eco-core/core-plugin/src/main/java/com/willfp/talismans/TalismansPlugin.java
View File

@@ -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<IntegrationLoader> getIntegrationLoaders() {
return Arrays.asList(
new IntegrationLoader("mcMMO", () -> McmmoManager.registerIntegration(new McmmoIntegrationImpl()))
);
return new ArrayList<>();
}
/**

13
eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoIntegration.java
View File

@@ -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);
}

45
eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/McmmoManager.java
View File

@@ -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<McmmoIntegration> 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();
}
}

18
eco-core/core-plugin/src/main/java/com/willfp/talismans/integrations/mcmmo/plugins/McmmoIntegrationImpl.java
View File

@@ -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";
}
}

2
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/talismans/FluxTalisman.java
View File

@@ -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;

2
eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java
View File

@@ -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;