diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/ExtensionServiceImplementation.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/ExtensionServiceImplementation.java index f61955b15..a37c8ae77 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/ExtensionServiceImplementation.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/ExtensionServiceImplementation.java @@ -27,7 +27,6 @@ import com.djrapitops.plan.system.database.DBSystem; import com.djrapitops.plan.system.info.server.ServerInfo; import com.djrapitops.plan.system.processing.Processing; import com.djrapitops.plan.system.settings.config.PlanConfig; -import com.djrapitops.plugin.api.Check; import com.djrapitops.plugin.logging.L; import com.djrapitops.plugin.logging.console.PluginLogger; import com.djrapitops.plugin.logging.error.ErrorHandler; @@ -84,8 +83,6 @@ public class ExtensionServiceImplementation implements ExtensionService { public void register() { try { extensionRegister.registerBuiltInExtensions(config.getPluginsConfigSection().getDisabled()); - if (Check.isBukkitAvailable()) extensionRegister.registerBukkitExtensions(); - if (Check.isBungeeAvailable()) extensionRegister.registerBungeeExtensions(); } catch (IllegalStateException failedToRegisterOne) { logger.warn("One or more extensions failed to register, see suppressed exceptions."); errorHandler.log(L.WARN, this.getClass(), failedToRegisterOne); diff --git a/Plan/extensions/build.gradle b/Plan/extensions/build.gradle index 41022180e..f0550bf0c 100644 --- a/Plan/extensions/build.gradle +++ b/Plan/extensions/build.gradle @@ -1,6 +1,6 @@ dependencies { compile project(path: ":api") - compile 'com.djrapitops:Extension-AAC:4.0.5-R0.3' + compile 'com.djrapitops:Extension-AAC:4.0.11-R0.1' compile 'com.djrapitops:Extension-AdvancedAchievements:1.1-R0.3' compile 'com.djrapitops:Extension-AdvancedBan:2.1.5-R0.6' compile 'com.djrapitops:Extension-ASkyBlock:3.0.9.4-R0.4' @@ -14,13 +14,13 @@ dependencies { compile 'com.djrapitops:Extension-McMMO:2.1.44-R0.2' compile 'com.djrapitops:Extension-MinigamesLib:1.14.17-R0.2' compile 'com.djrapitops:Extension-Nucleus:1.9.2-R0.2' - compile 'com.djrapitops:Extension-nuVotifier:2.3.4-R0.2' - compile 'com.djrapitops:Extension-ProtocolSupport:4.29-R0.2' + compile 'com.djrapitops:Extension-nuVotifier:2.3.4-R0.3' + compile 'com.djrapitops:Extension-ProtocolSupport:4.29-R0.3' compile 'com.djrapitops:Extension-RedProtect:7.5.6-R0.2' compile 'com.djrapitops:Extension-Sponge-Economy:7.1.0-R0.3' compile 'com.djrapitops:Extension-SuperbVote:0.5.4-R0.1' compile 'com.djrapitops:Extension-Vault:1.7-R0.2' - compile 'com.djrapitops:Extension-ViaVersion:2.1.3-R0.3' + compile 'com.djrapitops:Extension-ViaVersion:2.1.3-R1.0' } shadowJar { diff --git a/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java b/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java index 14fb136c9..f301b43cd 100644 --- a/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java +++ b/Plan/extensions/src/main/java/com/djrapitops/plan/extension/implementation/ExtensionRegister.java @@ -69,18 +69,11 @@ public class ExtensionRegister { register(new SpongeEconomyExtensionFactory()::createExtension, SpongeEconomyExtensionFactory.class); register(new SuperbVoteExtensionFactory()::createExtension, SuperbVoteExtensionFactory.class); register(new VaultExtensionFactory()::createExtension, VaultExtensionFactory.class); + register(new ViaVersionExtensionFactory()::createExtension, ViaVersionExtensionFactory.class); if (registerException != null) throw registerException; } - public void registerBukkitExtensions() { - register(new ViaVersionBukkitExtensionFactory()::createExtension, ViaVersionBukkitExtensionFactory.class); - } - - public void registerBungeeExtensions() { - register(new ViaVersionBungeeExtensionFactory()::createExtension, ViaVersionBungeeExtensionFactory.class); - } - private void registerEssentialsExtension(ExtensionService extensionService) { EssentialsExtensionFactory essentials = new EssentialsExtensionFactory(); essentials.createExtension()