From 85321899adcee1c49d41edde488dc4d0e0de51cc Mon Sep 17 00:00:00 2001 From: Aurora Lahtela <24460436+AuroraLS3@users.noreply.github.com> Date: Wed, 13 Jul 2022 19:49:48 +0300 Subject: [PATCH] Move extensions to different packages - Commented out nucleus and redprotect (still need update to sponge 8) - Commented out Coreprotect (not supported) --- Plan/extensions/build.gradle | 92 +++++++++---------- .../implementation/ExtensionRegister.java | 48 +++++++++- 2 files changed, 91 insertions(+), 49 deletions(-) diff --git a/Plan/extensions/build.gradle b/Plan/extensions/build.gradle index d7ffdb417..7b4c1823c 100644 --- a/Plan/extensions/build.gradle +++ b/Plan/extensions/build.gradle @@ -1,51 +1,51 @@ dependencies { implementation project(path: ":api") - implementation 'com.djrapitops:Extension-AAC:4.4.2-R0.1' - implementation 'com.djrapitops:Extension-AdvancedAchievements:6.4.0-R0.1' - implementation 'com.djrapitops:Extension-AdvancedBan:2.1.5-R1.0' - implementation 'com.djrapitops:Extension-ASkyBlock:3.0.9.4-R0.5' - implementation 'com.djrapitops:Extension-AuthMe:5.6.0-R0.2' - implementation 'com.djrapitops:Extension-BanManager:7.3.1-R0.2' - implementation 'com.djrapitops:Extension-BentoBox:1.15.5-R1.0' - implementation 'com.djrapitops:Extension-CoreProtect:2.16.0-R0.4' - implementation 'com.djrapitops:Extension-DiscordSRV:1.18.0-R0.4' - implementation 'com.djrapitops:Extension-DKBans:2.1.2-R0.3' - implementation 'com.djrapitops:Extension-DKCoins:3.0.5-R0.1' - implementation 'com.djrapitops:Extension-EssentialsX:2.15.0-R1.0' - implementation 'com.djrapitops:Extension-Factions:2.14.0-R0.1' - implementation 'com.djrapitops:Extension-FactionsUUID:1.6.9.5-U0.5.25-R0.1' - implementation 'com.djrapitops:Extension-FastLogin:R0.1' - implementation 'com.djrapitops:Extension-Floodgate:2.0-R0.2' - implementation 'com.djrapitops:Extension-GriefDefender:2.1.0-R0.1' - implementation 'com.djrapitops:Extension-GriefPrevention:16.11.6-R0.2' - implementation 'com.djrapitops:Extension-GriefPrevention-Sponge:4.0.1-R0.2' - implementation 'com.djrapitops:Extension-Heroes:R0.2' - implementation 'com.djrapitops:Extension-Jobs:4.16.3-R0.1' - implementation 'com.djrapitops:Extension-KingdomsX:1.12.6.3.1-R0.4' - implementation 'com.djrapitops:Extension-Lands:5.4.12-R0.1' - implementation 'net.playeranalytics:Extension-LibertyBans:0.8.0-R0.2' - implementation 'com.djrapitops:Extension-Litebans:0.3.4-R0.3' - implementation 'com.djrapitops:Extension-LogBlock:1.16.1.2-R0.9' - implementation 'com.djrapitops:Extension-LuckPerms:5.0-R0.5' - implementation 'com.djrapitops:Extension-MarriageMaster:2.3-R0.3' - implementation 'com.djrapitops:Extension-McMMO:2.1.149-R1.5' - implementation 'com.djrapitops:Extension-MinigamesLib:1.14.17-R0.2' - implementation 'com.djrapitops:Extension-MyPet:3.10-R0.2' - implementation 'com.djrapitops:Extension-Nucleus:2.3.0-R0.1' - implementation 'com.djrapitops:Extension-nuVotifier:2.3.4-R0.3' - implementation 'com.djrapitops:Extension-PlaceholderAPI:2.10.9-R0.5' - implementation 'com.djrapitops:Extension-PlotSquared:5.13.11-R0.2' - implementation 'com.djrapitops:Extension-ProtectionStones:2.8.2-R0.2' - implementation 'com.djrapitops:Extension-ProtocolSupport:1.16.4-R0.3' - implementation 'com.djrapitops:Extension-Quests:4.0.5-R0.1' - implementation 'com.djrapitops:Extension-React:6.651-R0.1' - implementation 'com.djrapitops:Extension-RedProtect:7.7.3-R0.1' - implementation 'com.djrapitops:Extension-Sponge-Economy:8.0.0-R0.3' - implementation 'com.djrapitops:Extension-SuperbVote:0.5.4-R0.1' - implementation 'com.djrapitops:Extension-Tebex:R1.3' - implementation 'com.djrapitops:Extension-Towny:0.96.7.4-R0.2' - implementation 'com.djrapitops:Extension-Vault:1.7-R0.3' - implementation 'com.djrapitops:Extension-ViaVersion:4.0.1-R0.3' + implementation 'net.playeranalytics:Extension-AAC:4.4.2-R1.1' + implementation 'net.playeranalytics:Extension-AdvancedAchievements:6.4.0-R1.1' + implementation 'net.playeranalytics:Extension-AdvancedBan:2.1.5-R2.0' + implementation 'net.playeranalytics:Extension-ASkyBlock:3.0.9.4-R1.5' + implementation 'net.playeranalytics:Extension-AuthMe:5.6.0-R1.2' + implementation 'net.playeranalytics:Extension-BanManager:7.3.1-R1.2' + implementation 'net.playeranalytics:Extension-BentoBox:1.15.5-R2.0' +// implementation 'net.playeranalytics:Extension-CoreProtect:2.16.0-R1.4' // unable to compile new version + implementation 'net.playeranalytics:Extension-DiscordSRV:1.25.1-R1.4' + implementation 'net.playeranalytics:Extension-DKBans:2.1.2-R1.3' + implementation 'net.playeranalytics:Extension-DKCoins:3.0.5-R1.1' + implementation 'net.playeranalytics:Extension-EssentialsX:2.15.0-R2.0' + implementation 'net.playeranalytics:Extension-Factions:2.14.0-R1.1' + implementation 'net.playeranalytics:Extension-FactionsUUID:1.6.9.5-U0.5.25-R1.1' + implementation 'net.playeranalytics:Extension-FastLogin:R1.1' + implementation 'net.playeranalytics:Extension-Floodgate:2.0-R1.2' + implementation 'net.playeranalytics:Extension-GriefDefender:2.1.0-R1.1' + implementation 'net.playeranalytics:Extension-GriefPrevention:16.11.6-R1.2' + implementation 'net.playeranalytics:Extension-GriefPrevention-Sponge:4.0.1-R1.2' + implementation 'net.playeranalytics:Extension-Heroes:R1.2' + implementation 'net.playeranalytics:Extension-Jobs:4.16.3-R1.1' + implementation 'net.playeranalytics:Extension-KingdomsX:1.12.6.3.1-R1.4' + implementation 'net.playeranalytics:Extension-Lands:5.4.12-R1.1' + implementation 'net.playeranalytics:Extension-LibertyBans:0.8.0-R1.2' + implementation 'net.playeranalytics:Extension-Litebans:0.3.4-R1.4' + implementation 'net.playeranalytics:Extension-LogBlock:1.16.1.2-R1.9' + implementation 'net.playeranalytics:Extension-LuckPerms:5.0-R1.5' + implementation 'net.playeranalytics:Extension-MarriageMaster:2.3-R1.3' + implementation 'net.playeranalytics:Extension-McMMO:2.1.149-R2.5' + implementation 'net.playeranalytics:Extension-MinigamesLib:1.14.17-R1.2' + implementation 'net.playeranalytics:Extension-MyPet:3.10-R1.2' +// implementation 'net.playeranalytics:Extension-Nucleus:2.3.0-R1.1' // TODO Update to sponge 8 + implementation 'net.playeranalytics:Extension-nuVotifier:2.3.4-R1.3' + implementation 'net.playeranalytics:Extension-PlaceholderAPI:2.10.9-R1.5' + implementation 'net.playeranalytics:Extension-PlotSquared:5.13.11-R1.2' + implementation 'net.playeranalytics:Extension-ProtectionStones:2.8.2-R1.2' + implementation 'net.playeranalytics:Extension-ProtocolSupport:1.16.4-R1.3' + implementation 'net.playeranalytics:Extension-Quests:4.0.5-R1.1' + implementation 'net.playeranalytics:Extension-React:6.651-R1.1' +// implementation 'net.playeranalytics:Extension-RedProtect:7.7.3-R1.1' // TODO Update to sponge 8 + implementation 'net.playeranalytics:Extension-Sponge-Economy:8.0.0-R1.3' + implementation 'net.playeranalytics:Extension-SuperbVote:0.5.4-R1.1' + implementation 'net.playeranalytics:Extension-Tebex:R2.3' + implementation 'net.playeranalytics:Extension-Towny:0.96.7.4-R1.2' + implementation 'net.playeranalytics:Extension-Vault:1.7-R1.3' + implementation 'net.playeranalytics:Extension-ViaVersion:4.0.1-R1.3' } 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 7ac2dbd3b..cc682d28d 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 @@ -16,11 +16,53 @@ */ package com.djrapitops.plan.extension.implementation; -import com.djrapitops.extension.*; import com.djrapitops.plan.extension.Caller; import com.djrapitops.plan.extension.DataExtension; import com.djrapitops.plan.extension.ExtensionService; import com.djrapitops.plan.extension.NotReadyException; +import net.playeranalytics.extension.aac.AACExtensionFactory; +import net.playeranalytics.extension.advancedachievements.AdvancedAchievementsExtensionFactory; +import net.playeranalytics.extension.advancedban.AdvancedBanExtensionFactory; +import net.playeranalytics.extension.askyblock.ASkyBlockExtensionFactory; +import net.playeranalytics.extension.authme.AuthMeExtensionFactory; +import net.playeranalytics.extension.banmanager.BanManagerExtensionFactory; +import net.playeranalytics.extension.bentobox.BentoBoxExtensionFactory; +import net.playeranalytics.extension.discordsrv.DiscordSRVExtensionFactory; +import net.playeranalytics.extension.dkbans.DKBansExtensionFactory; +import net.playeranalytics.extension.dkcoins.DKCoinsExtensionFactory; +import net.playeranalytics.extension.essentials.EssentialsExtensionFactory; +import net.playeranalytics.extension.factions.FactionsExtensionFactory; +import net.playeranalytics.extension.factionsuuid.FactionsUUIDExtensionFactory; +import net.playeranalytics.extension.fastlogin.FastLoginExtensionFactory; +import net.playeranalytics.extension.floodgate.FloodgateExtensionFactory; +import net.playeranalytics.extension.griefdefender.GriefDefenderExtensionFactory; +import net.playeranalytics.extension.griefprevention.GriefPreventionExtensionFactory; +import net.playeranalytics.extension.griefprevention.sponge.GriefPreventionSpongeExtensionFactory; +import net.playeranalytics.extension.heroes.HeroesExtensionFactory; +import net.playeranalytics.extension.jobs.JobsExtensionFactory; +import net.playeranalytics.extension.kingdomsx.KingdomsXExtensionFactory; +import net.playeranalytics.extension.lands.LandsExtensionFactory; +import net.playeranalytics.extension.libertybans.LibertyBansExtensionFactory; +import net.playeranalytics.extension.litebans.LitebansExtensionFactory; +import net.playeranalytics.extension.logblock.LogBlockExtensionFactory; +import net.playeranalytics.extension.luckperms.LuckPermsExtensionFactory; +import net.playeranalytics.extension.marriagemaster.MarriageMasterExtensionFactory; +import net.playeranalytics.extension.mcmmo.McMMOExtensionFactory; +import net.playeranalytics.extension.minigameslib.MinigameLibExtensionFactory; +import net.playeranalytics.extension.mypet.MyPetExtensionFactory; +import net.playeranalytics.extension.nuvotifier.NuVotifierExtensionFactory; +import net.playeranalytics.extension.placeholderapi.PlaceholderAPIExtensionFactory; +import net.playeranalytics.extension.plotsquared.PlotSquaredExtensionFactory; +import net.playeranalytics.extension.protectionstones.ProtectionStonesExtensionFactory; +import net.playeranalytics.extension.protocolsupport.ProtocolSupportExtensionFactory; +import net.playeranalytics.extension.quests.QuestsExtensionFactory; +import net.playeranalytics.extension.react.ReactExtensionFactory; +import net.playeranalytics.extension.spongeeconomy.SpongeEconomyExtensionFactory; +import net.playeranalytics.extension.superbvote.SuperbVoteExtensionFactory; +import net.playeranalytics.extension.tebex.BuycraftExtensionFactory; +import net.playeranalytics.extension.towny.TownyExtensionFactory; +import net.playeranalytics.extension.vault.VaultExtensionFactory; +import net.playeranalytics.extension.viaversion.ViaVersionExtensionFactory; import javax.inject.Inject; import javax.inject.Named; @@ -75,7 +117,7 @@ public class ExtensionRegister { register(new FloodgateExtensionFactory(), FloodgateExtensionFactory::createExtension, FloodgateExtensionFactory::registerListener); register(new GriefDefenderExtensionFactory(), GriefDefenderExtensionFactory::createExtension); register(new GriefPreventionExtensionFactory(), GriefPreventionExtensionFactory::createExtension); - //register(new GriefPreventionSpongeExtensionFactory(), GriefPreventionSpongeExtensionFactory::createExtension); // TODO: update for Sponge API 8 + register(new GriefPreventionSpongeExtensionFactory(), GriefPreventionSpongeExtensionFactory::createExtension); register(new HeroesExtensionFactory(), HeroesExtensionFactory::createExtension); register(new KingdomsXExtensionFactory(), KingdomsXExtensionFactory::createExtension); register(new JobsExtensionFactory(), JobsExtensionFactory::createExtension); @@ -96,7 +138,7 @@ public class ExtensionRegister { register(new ProtocolSupportExtensionFactory(), ProtocolSupportExtensionFactory::createExtension); register(new QuestsExtensionFactory(), QuestsExtensionFactory::createExtension); register(new ReactExtensionFactory(), ReactExtensionFactory::createExtension); - register(new RedProtectExtensionFactory(), RedProtectExtensionFactory::createExtension); +// register(new RedProtectExtensionFactory(), RedProtectExtensionFactory::createExtension); // TODO: update for Sponge API 8 register(new SpongeEconomyExtensionFactory(), SpongeEconomyExtensionFactory::createExtension); register(new SuperbVoteExtensionFactory(), SuperbVoteExtensionFactory::createExtension); register(new TownyExtensionFactory(), TownyExtensionFactory::createExtension);